New upstream version 0.26.1upstream/0.26.1

196 files changed, 18577 insertions, 18082 deletions

diff --git a/src/.unitize/_CameraInternals.c b/src/.unitize/_CameraInternals.c
index 43ec28c..c7ab887 100644
--- a/src/.unitize/_CameraInternals.c
+++ b/src/.unitize/_CameraInternals.c
@@ -1,4 +1,4 @@
-/* _CameraInternals.c generated by valac 0.34.4, the Vala compiler
+/* _CameraInternals.c generated by valac 0.34.7, the Vala compiler
  * generated from _CameraInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_ConfigInternals.c b/src/.unitize/_ConfigInternals.c
index f9b89f0..d0acc18 100644
--- a/src/.unitize/_ConfigInternals.c
+++ b/src/.unitize/_ConfigInternals.c
@@ -1,4 +1,4 @@
-/* _ConfigInternals.c generated by valac 0.34.4, the Vala compiler
+/* _ConfigInternals.c generated by valac 0.34.7, the Vala compiler
  * generated from _ConfigInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_CoreInternals.c b/src/.unitize/_CoreInternals.c
index c2abfec..309e707 100644
--- a/src/.unitize/_CoreInternals.c
+++ b/src/.unitize/_CoreInternals.c
@@ -1,4 +1,4 @@
-/* _CoreInternals.c generated by valac 0.34.4, the Vala compiler
+/* _CoreInternals.c generated by valac 0.34.7, the Vala compiler
  * generated from _CoreInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_DataImportsInternals.c b/src/.unitize/_DataImportsInternals.c
index f43d488..2dd8bb3 100644
--- a/src/.unitize/_DataImportsInternals.c
+++ b/src/.unitize/_DataImportsInternals.c
@@ -1,4 +1,4 @@
-/* _DataImportsInternals.c generated by valac 0.34.4, the Vala compiler
+/* _DataImportsInternals.c generated by valac 0.34.7, the Vala compiler
  * generated from _DataImportsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_DbInternals.c b/src/.unitize/_DbInternals.c
index 2038397..abad513 100644
--- a/src/.unitize/_DbInternals.c
+++ b/src/.unitize/_DbInternals.c
@@ -1,4 +1,4 @@
-/* _DbInternals.c generated by valac 0.34.4, the Vala compiler
+/* _DbInternals.c generated by valac 0.34.7, the Vala compiler
  * generated from _DbInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_DirectInternals.c b/src/.unitize/_DirectInternals.c
index 287b158..466afe5 100644
--- a/src/.unitize/_DirectInternals.c
+++ b/src/.unitize/_DirectInternals.c
@@ -1,4 +1,4 @@
-/* _DirectInternals.c generated by valac 0.34.4, the Vala compiler
+/* _DirectInternals.c generated by valac 0.34.7, the Vala compiler
  * generated from _DirectInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_Direct_unitize_entry.c b/src/.unitize/_Direct_unitize_entry.c
index 1ef3c0d..c4a3249 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.4, the Vala compiler
+/* _Direct_unitize_entry.c generated by valac 0.34.7, 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 8b052de..85aa7f5 100644
--- a/src/.unitize/_EditingToolsInternals.c
+++ b/src/.unitize/_EditingToolsInternals.c
@@ -1,4 +1,4 @@
-/* _EditingToolsInternals.c generated by valac 0.34.4, the Vala compiler
+/* _EditingToolsInternals.c generated by valac 0.34.7, the Vala compiler
  * generated from _EditingToolsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_EventsInternals.c b/src/.unitize/_EventsInternals.c
index 3ae2e86..01acadf 100644
--- a/src/.unitize/_EventsInternals.c
+++ b/src/.unitize/_EventsInternals.c
@@ -1,4 +1,4 @@
-/* _EventsInternals.c generated by valac 0.34.4, the Vala compiler
+/* _EventsInternals.c generated by valac 0.34.7, the Vala compiler
  * generated from _EventsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_FoldersInternals.c b/src/.unitize/_FoldersInternals.c
index 696ae50..cb111ea 100644
--- a/src/.unitize/_FoldersInternals.c
+++ b/src/.unitize/_FoldersInternals.c
@@ -1,4 +1,4 @@
-/* _FoldersInternals.c generated by valac 0.34.4, the Vala compiler
+/* _FoldersInternals.c generated by valac 0.34.7, the Vala compiler
  * generated from _FoldersInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_LibraryInternals.c b/src/.unitize/_LibraryInternals.c
index 4a6d4ef..4d9519e 100644
--- a/src/.unitize/_LibraryInternals.c
+++ b/src/.unitize/_LibraryInternals.c
@@ -1,4 +1,4 @@
-/* _LibraryInternals.c generated by valac 0.34.4, the Vala compiler
+/* _LibraryInternals.c generated by valac 0.34.7, the Vala compiler
  * generated from _LibraryInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_Library_unitize_entry.c b/src/.unitize/_Library_unitize_entry.c
index 8f86bb1..6159421 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.4, the Vala compiler
+/* _Library_unitize_entry.c generated by valac 0.34.7, 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 793acc8..dee0ffc 100644
--- a/src/.unitize/_PhotosInternals.c
+++ b/src/.unitize/_PhotosInternals.c
@@ -1,4 +1,4 @@
-/* _PhotosInternals.c generated by valac 0.34.4, the Vala compiler
+/* _PhotosInternals.c generated by valac 0.34.7, the Vala compiler
  * generated from _PhotosInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_PluginsInternals.c b/src/.unitize/_PluginsInternals.c
index 64ca182..35345fb 100644
--- a/src/.unitize/_PluginsInternals.c
+++ b/src/.unitize/_PluginsInternals.c
@@ -1,4 +1,4 @@
-/* _PluginsInternals.c generated by valac 0.34.4, the Vala compiler
+/* _PluginsInternals.c generated by valac 0.34.7, the Vala compiler
  * generated from _PluginsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_PublishingInternals.c b/src/.unitize/_PublishingInternals.c
index 745bf59..37a3b69 100644
--- a/src/.unitize/_PublishingInternals.c
+++ b/src/.unitize/_PublishingInternals.c
@@ -1,4 +1,4 @@
-/* _PublishingInternals.c generated by valac 0.34.4, the Vala compiler
+/* _PublishingInternals.c generated by valac 0.34.7, the Vala compiler
  * generated from _PublishingInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_SearchesInternals.c b/src/.unitize/_SearchesInternals.c
index 7af4ca2..4e0d477 100644
--- a/src/.unitize/_SearchesInternals.c
+++ b/src/.unitize/_SearchesInternals.c
@@ -1,4 +1,4 @@
-/* _SearchesInternals.c generated by valac 0.34.4, the Vala compiler
+/* _SearchesInternals.c generated by valac 0.34.7, the Vala compiler
  * generated from _SearchesInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_SidebarInternals.c b/src/.unitize/_SidebarInternals.c
index 309f5e9..b9ed3c9 100644
--- a/src/.unitize/_SidebarInternals.c
+++ b/src/.unitize/_SidebarInternals.c
@@ -1,4 +1,4 @@
-/* _SidebarInternals.c generated by valac 0.34.4, the Vala compiler
+/* _SidebarInternals.c generated by valac 0.34.7, the Vala compiler
  * generated from _SidebarInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_SlideshowInternals.c b/src/.unitize/_SlideshowInternals.c
index f456df8..db6e8b8 100644
--- a/src/.unitize/_SlideshowInternals.c
+++ b/src/.unitize/_SlideshowInternals.c
@@ -1,4 +1,4 @@
-/* _SlideshowInternals.c generated by valac 0.34.4, the Vala compiler
+/* _SlideshowInternals.c generated by valac 0.34.7, the Vala compiler
  * generated from _SlideshowInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_TagsInternals.c b/src/.unitize/_TagsInternals.c
index 663c289..e3ae9ae 100644
--- a/src/.unitize/_TagsInternals.c
+++ b/src/.unitize/_TagsInternals.c
@@ -1,4 +1,4 @@
-/* _TagsInternals.c generated by valac 0.34.4, the Vala compiler
+/* _TagsInternals.c generated by valac 0.34.7, the Vala compiler
  * generated from _TagsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_ThreadsInternals.c b/src/.unitize/_ThreadsInternals.c
index 8b4682f..5688530 100644
--- a/src/.unitize/_ThreadsInternals.c
+++ b/src/.unitize/_ThreadsInternals.c
@@ -1,4 +1,4 @@
-/* _ThreadsInternals.c generated by valac 0.34.4, the Vala compiler
+/* _ThreadsInternals.c generated by valac 0.34.7, the Vala compiler
  * generated from _ThreadsInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_UnitInternals.c b/src/.unitize/_UnitInternals.c
index e79a416..1d4145e 100644
--- a/src/.unitize/_UnitInternals.c
+++ b/src/.unitize/_UnitInternals.c
@@ -1,4 +1,4 @@
-/* _UnitInternals.c generated by valac 0.34.4, the Vala compiler
+/* _UnitInternals.c generated by valac 0.34.7, the Vala compiler
  * generated from _UnitInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_UtilInternals.c b/src/.unitize/_UtilInternals.c
index 2656134..be52964 100644
--- a/src/.unitize/_UtilInternals.c
+++ b/src/.unitize/_UtilInternals.c
@@ -1,4 +1,4 @@
-/* _UtilInternals.c generated by valac 0.34.4, the Vala compiler
+/* _UtilInternals.c generated by valac 0.34.7, the Vala compiler
  * generated from _UtilInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/AppDirs.c b/src/AppDirs.c
index 6e6c89b..8f16665 100644
--- a/src/AppDirs.c
+++ b/src/AppDirs.c
@@ -1,4 +1,4 @@
-/* AppDirs.c generated by valac 0.34.4, the Vala compiler
+/* AppDirs.c generated by valac 0.34.7, the Vala compiler
  * generated from AppDirs.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/AppWindow.c b/src/AppWindow.c
index 9eab2b4..ca346cb 100644
--- a/src/AppWindow.c
+++ b/src/AppWindow.c
@@ -1,4 +1,4 @@
-/* AppWindow.c generated by valac 0.34.4, the Vala compiler
+/* AppWindow.c generated by valac 0.34.7, the Vala compiler
  * generated from AppWindow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -11,10 +11,10 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 #include <time.h>
+#include <gdk/gdk.h>
 #include <gio/gio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <gdk/gdk.h>
 #include <cairo.h>
 #include <glib/gi18n-lib.h>
 #include <float.h>
@@ -1494,15 +1494,15 @@ 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 = 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 = 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 = 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 = 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 = 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"
@@ -2255,21 +2255,21 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -3354,47 +3354,58 @@ void app_window_on_about (AppWindow* self) {
 	gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
+	GdkPixbuf* _tmp6_ = NULL;
+	GdkPixbuf* _tmp7_ = NULL;
+	const gchar* _tmp8_ = NULL;
 #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"
-	_tmp0_ = app_window_get_app_role (self);
+	_tmp0_ = g_strdup_printf ("%s \u2013 “Aachen”", RESOURCES_APP_VERSION);
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp2_ = _ ("Visit the Shotwell web site");
+	_tmp2_ = _ (_tmp1_);
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp3_ = resources_get_icon (RESOURCES_ICON_ABOUT_LOGO, -1);
+	_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_ = _ ("translator-credits");
+	_tmp5_ = _ ("Visit the Shotwell web site");
 #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", RESOURCES_APP_VERSION " \u2013 \"Aachen\"", "comments", _tmp1_, "copyright", RESOURCES_COPYRIGHT, "website", RESOURCES_HOME_URL, "license", RESOURCES_LICENSE, "website-label", _tmp2_, "authors", RESOURCES_AUTHORS, "logo", _tmp4_, "artists", artists, "translator-credits", _tmp5_, NULL, NULL);
+	_tmp6_ = resources_get_icon (RESOURCES_ICON_ABOUT_LOGO, -1);
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_object_unref0 (_tmp4_);
+	_tmp7_ = _tmp6_;
+#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp8_ = _ ("translator-credits");
+#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);
+#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_g_object_unref0 (_tmp7_);
+#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_g_free0 (_tmp4_);
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp1_);
-#line 3349 "AppWindow.c"
+#line 3360 "AppWindow.c"
 }
 
 
 static void app_window_on_help_contents (AppWindow* self) {
 	GError * _inner_error_ = NULL;
-#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 3357 "AppWindow.c"
+#line 3368 "AppWindow.c"
 	{
 		GdkScreen* _tmp0_ = NULL;
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#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 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		resources_launch_help (_tmp0_, NULL, &_inner_error_);
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3366 "AppWindow.c"
+#line 3377 "AppWindow.c"
 			goto __catch228_g_error;
 		}
 	}
@@ -3407,53 +3418,53 @@ static void app_window_on_help_contents (AppWindow* self) {
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = _ ("Unable to display help: %s");
-#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = err;
-#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _tmp2_->message;
-#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = g_strdup_printf (_tmp1_, _tmp3_);
-#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp5_, NULL);
-#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp5_);
-#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3399 "AppWindow.c"
+#line 3410 "AppWindow.c"
 	}
 	__finally228:
-#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.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 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3410 "AppWindow.c"
+#line 3421 "AppWindow.c"
 	}
 }
 
 
 static void app_window_on_help_report_problem (AppWindow* self) {
 	GError * _inner_error_ = NULL;
-#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 3419 "AppWindow.c"
+#line 3430 "AppWindow.c"
 	{
-#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, RESOURCES_BUG_DB_URL, &_inner_error_);
-#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3425 "AppWindow.c"
+#line 3436 "AppWindow.c"
 			goto __catch229_g_error;
 		}
 	}
@@ -3466,53 +3477,53 @@ static void app_window_on_help_report_problem (AppWindow* self) {
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _ ("Unable to navigate to bug database: %s");
-#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = err;
-#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = _tmp1_->message;
-#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp3_;
-#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp4_, NULL);
-#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp4_);
-#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3458 "AppWindow.c"
+#line 3469 "AppWindow.c"
 	}
 	__finally229:
-#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/AppWindow.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 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3469 "AppWindow.c"
+#line 3480 "AppWindow.c"
 	}
 }
 
 
 static void app_window_on_help_faq (AppWindow* self) {
 	GError * _inner_error_ = NULL;
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 3478 "AppWindow.c"
+#line 3489 "AppWindow.c"
 	{
-#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, RESOURCES_FAQ_URL, &_inner_error_);
-#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3484 "AppWindow.c"
+#line 3495 "AppWindow.c"
 			goto __catch230_g_error;
 		}
 	}
@@ -3525,38 +3536,38 @@ static void app_window_on_help_faq (AppWindow* self) {
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _ ("Unable to display FAQ: %s");
-#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = err;
-#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = _tmp1_->message;
-#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp3_;
-#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp4_, NULL);
-#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp4_);
-#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3517 "AppWindow.c"
+#line 3528 "AppWindow.c"
 	}
 	__finally230:
-#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/AppWindow.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 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3528 "AppWindow.c"
+#line 3539 "AppWindow.c"
 	}
 }
 
@@ -3564,24 +3575,24 @@ static void app_window_on_help_faq (AppWindow* self) {
 static void app_window_real_on_quit (AppWindow* self) {
 	Application* _tmp0_ = NULL;
 	Application* _tmp1_ = NULL;
-#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 635 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = application_get_instance ();
-#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 635 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 635 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	application_exit (_tmp1_);
-#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 635 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_application_unref0 (_tmp1_);
-#line 3544 "AppWindow.c"
+#line 3555 "AppWindow.c"
 }
 
 
 void app_window_on_quit (AppWindow* self) {
-#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->on_quit (self);
-#line 3553 "AppWindow.c"
+#line 3564 "AppWindow.c"
 }
 
 
@@ -3604,71 +3615,71 @@ void app_window_on_jump_to_file (AppWindow* self) {
 	MediaSource* _tmp14_ = NULL;
 	MediaSource* _tmp15_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page_get_view (_tmp1_);
-#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = _tmp4_ != 1;
-#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp5_) {
 #line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp5_) {
+#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3598 "AppWindow.c"
+#line 3609 "AppWindow.c"
 	}
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#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));
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = page_get_view (_tmp7_);
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = view_collection_get_selected_at (_tmp9_, 0);
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = data_view_get_source (_tmp11_);
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp12_) : NULL;
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp13_ == NULL) {
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp12_);
-#line 3620 "AppWindow.c"
+#line 3631 "AppWindow.c"
 	}
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = _tmp13_;
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp11_);
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_data_collection_unref0 (_tmp9_);
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	media = _tmp14_;
-#line 643 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = media;
-#line 643 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp15_ == NULL) {
 #line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp15_ == NULL) {
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (media);
-#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3640 "AppWindow.c"
+#line 3651 "AppWindow.c"
 	}
 	{
 		AppWindow* _tmp16_ = NULL;
@@ -3676,25 +3687,25 @@ void app_window_on_jump_to_file (AppWindow* self) {
 		MediaSource* _tmp18_ = NULL;
 		GFile* _tmp19_ = NULL;
 		GFile* _tmp20_ = NULL;
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp16_ = app_window_get_instance ();
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp17_ = _tmp16_;
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp18_ = media;
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp19_ = media_source_get_master_file (_tmp18_);
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp20_ = _tmp19_;
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_file_uri (_tmp17_, _tmp20_, &_inner_error_);
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp20_);
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp17_);
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3666 "AppWindow.c"
+#line 3677 "AppWindow.c"
 			goto __catch231_g_error;
 		}
 	}
@@ -3705,50 +3716,50 @@ void app_window_on_jump_to_file (AppWindow* self) {
 		GError* _tmp21_ = NULL;
 		gchar* _tmp22_ = NULL;
 		gchar* _tmp23_ = NULL;
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 649 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 650 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp21_ = err;
-#line 649 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 650 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp22_ = resources_jump_to_file_failed (_tmp21_);
-#line 649 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 650 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp23_ = _tmp22_;
-#line 649 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 650 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp23_, NULL);
-#line 649 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 650 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp23_);
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3693 "AppWindow.c"
+#line 3704 "AppWindow.c"
 	}
 	__finally231:
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (media);
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.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 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3706 "AppWindow.c"
+#line 3717 "AppWindow.c"
 	}
-#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (media);
-#line 3710 "AppWindow.c"
+#line 3721 "AppWindow.c"
 }
 
 
 static void app_window_real_destroy (GtkWidget* base) {
 	AppWindow * self;
-#line 653 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
 #line 654 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	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 3720 "AppWindow.c"
+#line 3731 "AppWindow.c"
 }
 
 
@@ -3761,7 +3772,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	g_return_val_if_fail (old != NULL, NULL);
 #line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 3733 "AppWindow.c"
+#line 3744 "AppWindow.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -3792,7 +3803,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3764 "AppWindow.c"
+#line 3775 "AppWindow.c"
 				goto __catch232_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3801,7 +3812,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3773 "AppWindow.c"
+#line 3784 "AppWindow.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
@@ -3817,7 +3828,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3789 "AppWindow.c"
+#line 3800 "AppWindow.c"
 				goto __catch232_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3828,7 +3839,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3800 "AppWindow.c"
+#line 3811 "AppWindow.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
@@ -3842,7 +3853,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 3814 "AppWindow.c"
+#line 3825 "AppWindow.c"
 	}
 	goto __finally232;
 	__catch232_g_regex_error:
@@ -3856,7 +3867,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 3828 "AppWindow.c"
+#line 3839 "AppWindow.c"
 	}
 	__finally232:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3867,7 +3878,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
-#line 3839 "AppWindow.c"
+#line 3850 "AppWindow.c"
 	}
 }
 
@@ -3878,53 +3889,53 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
 	gchar* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 657 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 658 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 657 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 658 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = get_nautilus_install_location ();
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = _tmp1_ != NULL;
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp1_);
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_) {
-#line 3864 "AppWindow.c"
+#line 3875 "AppWindow.c"
 		GFile* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = file;
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = g_file_get_uri (_tmp3_);
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = string_replace (_tmp5_, "'", "\\\'");
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (tmp);
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		tmp = _tmp6_;
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_free0 (_tmp5_);
 #line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_g_free0 (_tmp5_);
+#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = tmp;
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		show_file_in_nautilus (_tmp7_, &_inner_error_);
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			g_propagate_error (error, _inner_error_);
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_g_free0 (tmp);
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return;
-#line 3896 "AppWindow.c"
+#line 3907 "AppWindow.c"
 		}
 	} else {
 		GFile* _tmp8_ = NULL;
@@ -3934,44 +3945,44 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
-#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = file;
-#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = g_file_get_parent (_tmp8_);
-#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = g_file_get_uri (_tmp10_);
-#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = _tmp11_;
-#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp13_ = string_replace (_tmp12_, "'", "\\\'");
-#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (tmp);
-#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		tmp = _tmp13_;
-#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp12_);
-#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_object_unref0 (_tmp10_);
 #line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_g_object_unref0 (_tmp10_);
+#line 668 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp14_ = tmp;
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 668 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, _tmp14_, &_inner_error_);
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 668 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 668 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			g_propagate_error (error, _inner_error_);
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 668 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_g_free0 (tmp);
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 668 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return;
-#line 3938 "AppWindow.c"
+#line 3949 "AppWindow.c"
 		}
 	}
-#line 657 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 658 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (tmp);
-#line 3943 "AppWindow.c"
+#line 3954 "AppWindow.c"
 }
 
 
@@ -3980,42 +3991,42 @@ void app_window_show_uri (AppWindow* self, const gchar* url, GError** error) {
 	GdkScreen* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (url != NULL);
 #line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (url != NULL);
+#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gdk_window_get_screen (_tmp0_);
-#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = url;
-#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	sys_show_uri (_tmp1_, _tmp2_, &_inner_error_);
-#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_propagate_error (error, _inner_error_);
-#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3970 "AppWindow.c"
+#line 3981 "AppWindow.c"
 	}
 }
 
 
 static void app_window_real_add_actions (AppWindow* self) {
-#line 676 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#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 3978 "AppWindow.c"
+#line 3989 "AppWindow.c"
 }
 
 
 void app_window_add_actions (AppWindow* self) {
-#line 675 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 675 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->add_actions (self);
-#line 3987 "AppWindow.c"
+#line 3998 "AppWindow.c"
 }
 
 
@@ -4032,81 +4043,81 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) {
 	FullscreenWindow* _tmp12_ = NULL;
 	FullscreenWindow* _tmp13_ = NULL;
 	FullscreenWindow* _tmp14_ = NULL;
-#line 679 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 679 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 681 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_fullscreen_window;
-#line 681 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 4012 "AppWindow.c"
+#line 4023 "AppWindow.c"
 		FullscreenWindow* _tmp1_ = NULL;
-#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 683 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = app_window_fullscreen_window;
-#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 683 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
-#line 684 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4020 "AppWindow.c"
+#line 4031 "AppWindow.c"
 	}
-#line 687 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#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_);
-#line 687 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->pos_x = _tmp2_;
-#line 687 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	self->pos_y = _tmp3_;
 #line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	self->pos_y = _tmp3_;
+#line 689 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = page;
-#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = fullscreen_window_new (_tmp4_);
-#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp5_);
-#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fsw = _tmp5_;
-#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = _tmp7_ != NULL;
-#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp8_) {
-#line 4048 "AppWindow.c"
+#line 4059 "AppWindow.c"
 		Page* _tmp9_ = NULL;
 		Page* _tmp10_ = NULL;
 		FullscreenWindow* _tmp11_ = NULL;
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#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 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = fsw;
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_switching_to_fullscreen (_tmp10_, _tmp11_);
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp10_);
-#line 4062 "AppWindow.c"
+#line 4073 "AppWindow.c"
 	}
-#line 695 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = fsw;
-#line 695 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 695 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (app_window_fullscreen_window);
-#line 695 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_fullscreen_window = _tmp13_;
 #line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_fullscreen_window = _tmp13_;
+#line 697 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = app_window_fullscreen_window;
-#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 697 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow));
-#line 679 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (fsw);
-#line 4078 "AppWindow.c"
+#line 4089 "AppWindow.c"
 }
 
 
@@ -4119,65 +4130,65 @@ void app_window_end_fullscreen (AppWindow* self) {
 	gboolean _tmp5_ = FALSE;
 	FullscreenWindow* _tmp9_ = NULL;
 	FullscreenWindow* _tmp10_ = NULL;
-#line 699 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #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"
 	_tmp0_ = app_window_fullscreen_window;
-#line 700 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp0_ == NULL) {
 #line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp0_ == NULL) {
+#line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4099 "AppWindow.c"
+#line 4110 "AppWindow.c"
 	}
-#line 703 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = self->pos_x;
-#line 703 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->pos_y;
-#line 703 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp1_, _tmp2_);
-#line 705 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = _tmp4_ != NULL;
-#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp5_) {
-#line 4119 "AppWindow.c"
+#line 4130 "AppWindow.c"
 		Page* _tmp6_ = NULL;
 		Page* _tmp7_ = NULL;
 		FullscreenWindow* _tmp8_ = NULL;
-#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#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 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = app_window_fullscreen_window;
-#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_returning_from_fullscreen (_tmp7_, _tmp8_);
-#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp7_);
-#line 4133 "AppWindow.c"
+#line 4144 "AppWindow.c"
 	}
-#line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 711 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = app_window_fullscreen_window;
-#line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
 #line 711 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
+#line 712 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = app_window_fullscreen_window;
-#line 711 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
 #line 712 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
+#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (app_window_fullscreen_window);
-#line 712 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_fullscreen_window = NULL;
-#line 714 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 715 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 4149 "AppWindow.c"
+#line 4160 "AppWindow.c"
 }
 
 
@@ -4186,21 +4197,21 @@ GAction* app_window_get_common_action (AppWindow* self, const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	GAction* _tmp1_ = NULL;
 	GAction* _tmp2_ = NULL;
-#line 717 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
-#line 717 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), _tmp0_);
-#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp2_;
-#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 4172 "AppWindow.c"
+#line 4183 "AppWindow.c"
 }
 
 
@@ -4210,42 +4221,42 @@ void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name,
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (name != NULL);
 #line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (name != NULL);
+#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ == NULL) {
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 4196 "AppWindow.c"
+#line 4207 "AppWindow.c"
 	}
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	action = _tmp2_;
 #line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	action = _tmp2_;
+#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = action;
-#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4204 "AppWindow.c"
+#line 4215 "AppWindow.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = action;
-#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = sensitive;
-#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 4213 "AppWindow.c"
+#line 4224 "AppWindow.c"
 	}
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 4217 "AppWindow.c"
+#line 4228 "AppWindow.c"
 }
 
 
@@ -4255,45 +4266,45 @@ void app_window_set_common_action_important (AppWindow* self, const gchar* name,
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (name != NULL);
 #line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (name != NULL);
+#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ == NULL) {
-#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 4241 "AppWindow.c"
+#line 4252 "AppWindow.c"
 	}
-#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	action = _tmp2_;
 #line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	action = _tmp2_;
+#line 730 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = action;
-#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 730 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4249 "AppWindow.c"
+#line 4260 "AppWindow.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_ = FALSE;
-#line 730 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = action;
-#line 730 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 730 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 730 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp6_);
-#line 4261 "AppWindow.c"
+#line 4272 "AppWindow.c"
 	}
-#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 4265 "AppWindow.c"
+#line 4276 "AppWindow.c"
 }
 
 
@@ -4303,66 +4314,66 @@ void app_window_set_common_action_visible (AppWindow* self, const gchar* name, g
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (name != NULL);
 #line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (name != NULL);
+#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ == NULL) {
-#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 4289 "AppWindow.c"
+#line 4300 "AppWindow.c"
 	}
-#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	action = _tmp2_;
 #line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	action = _tmp2_;
+#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = action;
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4297 "AppWindow.c"
+#line 4308 "AppWindow.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_ = FALSE;
-#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = action;
-#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp6_);
-#line 4309 "AppWindow.c"
+#line 4320 "AppWindow.c"
 	}
-#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 4313 "AppWindow.c"
+#line 4324 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_update_common_actions ((AppWindow*) self);
-#line 4320 "AppWindow.c"
+#line 4331 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) {
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_update_common_actions ((AppWindow*) self);
-#line 4327 "AppWindow.c"
+#line 4338 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_update_common_actions ((AppWindow*) self);
-#line 4334 "AppWindow.c"
+#line 4345 "AppWindow.c"
 }
 
 
@@ -4374,23 +4385,23 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 	Page* _tmp15_ = NULL;
 	Page* _tmp34_ = NULL;
 	Page* _tmp35_ = NULL;
-#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
-#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
 #line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = old_page;
-#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = new_page;
-#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_update_common_action_availability (self, _tmp0_, _tmp1_);
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = old_page;
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 4362 "AppWindow.c"
+#line 4373 "AppWindow.c"
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
@@ -4403,49 +4414,49 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 		ViewCollection* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
 		guint _tmp14_ = 0U;
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = old_page;
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp6_, NULL, FALSE);
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _app_window_on_update_common_actions_data_collection_contents_altered, self);
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_data_collection_unref0 (_tmp5_);
 #line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_data_collection_unref0 (_tmp5_);
+#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = old_page;
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_parse_name ("selection-group-altered", TYPE_VIEW_COLLECTION, &_tmp10_, NULL, FALSE);
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _app_window_on_update_common_actions_view_collection_selection_group_altered, self);
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_data_collection_unref0 (_tmp9_);
 #line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_data_collection_unref0 (_tmp9_);
+#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = old_page;
-#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = page_get_view (_tmp11_);
-#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp13_ = _tmp12_;
-#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp14_, NULL, FALSE);
-#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		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 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp13_);
-#line 4411 "AppWindow.c"
+#line 4422 "AppWindow.c"
 	}
-#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = new_page;
-#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp15_ != NULL) {
-#line 4417 "AppWindow.c"
+#line 4428 "AppWindow.c"
 		Page* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
 		ViewCollection* _tmp18_ = NULL;
@@ -4464,135 +4475,135 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 		ViewCollection* _tmp31_ = NULL;
 		ViewCollection* _tmp32_ = NULL;
 		gint _tmp33_ = 0;
-#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp16_ = new_page;
-#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp17_ = page_get_view (_tmp16_);
-#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp18_ = _tmp17_;
-#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _app_window_on_update_common_actions_data_collection_contents_altered, self, 0);
-#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_data_collection_unref0 (_tmp18_);
 #line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_data_collection_unref0 (_tmp18_);
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp19_ = new_page;
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp20_ = page_get_view (_tmp19_);
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp21_ = _tmp20_;
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_connect_object (_tmp21_, "selection-group-altered", (GCallback) _app_window_on_update_common_actions_view_collection_selection_group_altered, self, 0);
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_data_collection_unref0 (_tmp21_);
 #line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_data_collection_unref0 (_tmp21_);
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp22_ = new_page;
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp23_ = page_get_view (_tmp22_);
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp24_ = _tmp23_;
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_connect_object (_tmp24_, "items-state-changed", (GCallback) _app_window_on_update_common_actions_view_collection_items_state_changed, self, 0);
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp24_);
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp25_ = new_page;
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp26_ = new_page;
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp27_ = page_get_view (_tmp26_);
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp28_ = _tmp27_;
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp29_ = view_collection_get_selected_count (_tmp28_);
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp30_ = new_page;
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp31_ = page_get_view (_tmp30_);
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp32_ = _tmp31_;
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp33_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_COLLECTION, DataCollection));
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_update_common_actions (self, _tmp25_, _tmp29_, _tmp33_);
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp32_);
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp28_);
-#line 4490 "AppWindow.c"
+#line 4501 "AppWindow.c"
 	}
-#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 758 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp34_ = old_page;
-#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 758 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp35_ = new_page;
-#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#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 4498 "AppWindow.c"
+#line 4509 "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;
-#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
 #line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
+#line 765 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = new_page;
-#line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE);
-#line 766 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_set_common_action_sensitive (self, "CommonSelectAll", is_checkerboard);
 #line 767 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	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 4517 "AppWindow.c"
+#line 4528 "AppWindow.c"
 }
 
 
 void app_window_update_common_action_availability (AppWindow* self, Page* old_page, Page* new_page) {
-#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->update_common_action_availability (self, old_page, new_page);
-#line 4526 "AppWindow.c"
+#line 4537 "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;
-#line 773 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_PAGE (page));
 #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 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 775 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE)) {
-#line 4539 "AppWindow.c"
+#line 4550 "AppWindow.c"
 		gint _tmp1_ = 0;
-#line 775 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 776 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = count;
-#line 775 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 776 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_set_common_action_sensitive (self, "CommonSelectAll", _tmp1_ > 0);
-#line 4545 "AppWindow.c"
+#line 4556 "AppWindow.c"
 	}
-#line 776 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = selected_count;
-#line 776 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_set_common_action_sensitive (self, "CommonJumpToFile", _tmp2_ == 1);
-#line 778 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_decorate_undo_action (self);
 #line 779 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_decorate_undo_action (self);
+#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_redo_action (self);
-#line 4555 "AppWindow.c"
+#line 4566 "AppWindow.c"
 }
 
 
 void app_window_update_common_actions (AppWindow* self, Page* page, gint selected_count, gint count) {
-#line 773 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 773 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->update_common_actions (self, page, selected_count, count);
-#line 4564 "AppWindow.c"
+#line 4575 "AppWindow.c"
 }
 
 
@@ -4600,17 +4611,17 @@ static void app_window_on_update_common_actions (AppWindow* self) {
 	Page* page = NULL;
 	Page* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #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"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	page = _tmp0_;
 #line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	page = _tmp0_;
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = page;
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 4582 "AppWindow.c"
+#line 4593 "AppWindow.c"
 		Page* _tmp2_ = NULL;
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
@@ -4620,35 +4631,35 @@ static void app_window_on_update_common_actions (AppWindow* self) {
 		ViewCollection* _tmp8_ = NULL;
 		ViewCollection* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
-#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = page;
-#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
-#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = view_collection_get_selected_count (_tmp5_);
-#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = page;
-#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection));
-#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_update_common_actions (self, _tmp2_, _tmp6_, _tmp10_);
-#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp9_);
-#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 4616 "AppWindow.c"
+#line 4627 "AppWindow.c"
 	}
-#line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 4620 "AppWindow.c"
+#line 4631 "AppWindow.c"
 }
 
 
@@ -4663,61 +4674,61 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 	gint items = 0;
 	GMenu* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
-#line 788 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 788 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (id != NULL);
-#line 788 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (new_label != NULL);
-#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page_get_menubar (_tmp1_);
-#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_menu_get_type ()) ? ((GMenu*) _tmp2_) : NULL;
-#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ == NULL) {
-#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp2_);
-#line 4653 "AppWindow.c"
+#line 4664 "AppWindow.c"
 	}
-#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	bar = _tmp4_;
-#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = bar;
-#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp5_ == NULL) {
 #line 793 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp5_ == NULL) {
+#line 794 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (bar);
-#line 793 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 794 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4669 "AppWindow.c"
+#line 4680 "AppWindow.c"
 	}
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = bar;
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = g_menu_model_get_n_items (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, g_menu_model_get_type (), GMenuModel));
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	items = _tmp7_;
-#line 4677 "AppWindow.c"
+#line 4688 "AppWindow.c"
 	{
 		gint i = 0;
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		i = 0;
-#line 4682 "AppWindow.c"
+#line 4693 "AppWindow.c"
 		{
 			gboolean _tmp8_ = FALSE;
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_tmp8_ = TRUE;
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			while (TRUE) {
-#line 4689 "AppWindow.c"
+#line 4700 "AppWindow.c"
 				gint _tmp10_ = 0;
 				gint _tmp11_ = 0;
 				GMenuModel* model = NULL;
@@ -4728,65 +4739,65 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 				gint model_items = 0;
 				GMenuModel* _tmp16_ = NULL;
 				gint _tmp17_ = 0;
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				if (!_tmp8_) {
-#line 4702 "AppWindow.c"
+#line 4713 "AppWindow.c"
 					gint _tmp9_ = 0;
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					_tmp9_ = i;
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					i = _tmp9_ + 1;
-#line 4708 "AppWindow.c"
+#line 4719 "AppWindow.c"
 				}
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp8_ = FALSE;
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp10_ = i;
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp11_ = items;
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				if (!(_tmp10_ < _tmp11_)) {
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					break;
-#line 4720 "AppWindow.c"
+#line 4731 "AppWindow.c"
 				}
-#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp12_ = bar;
-#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp13_ = i;
-#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp14_ = g_menu_model_get_item_link (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, g_menu_model_get_type (), GMenuModel), _tmp13_, G_MENU_LINK_SUBMENU);
-#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
-				model = _tmp14_;
 #line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
+				model = _tmp14_;
+#line 800 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp15_ = bar;
-#line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
-				if (_tmp15_ == NULL) {
 #line 800 "/home/jens/Source/shotwell/src/AppWindow.vala"
+				if (_tmp15_ == NULL) {
+#line 801 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					_g_object_unref0 (model);
-#line 800 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 801 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					continue;
-#line 4738 "AppWindow.c"
+#line 4749 "AppWindow.c"
 				}
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp16_ = model;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp17_ = g_menu_model_get_n_items (_tmp16_);
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				model_items = _tmp17_;
-#line 4746 "AppWindow.c"
+#line 4757 "AppWindow.c"
 				{
 					gint j = 0;
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					j = 0;
-#line 4751 "AppWindow.c"
+#line 4762 "AppWindow.c"
 					{
 						gboolean _tmp18_ = FALSE;
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 						_tmp18_ = TRUE;
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 						while (TRUE) {
-#line 4758 "AppWindow.c"
+#line 4769 "AppWindow.c"
 							gint _tmp20_ = 0;
 							gint _tmp21_ = 0;
 							GMenuModel* subsection = NULL;
@@ -4797,168 +4808,168 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 							gint sub_items = 0;
 							GMenuModel* _tmp26_ = NULL;
 							gint _tmp27_ = 0;
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							if (!_tmp18_) {
-#line 4771 "AppWindow.c"
+#line 4782 "AppWindow.c"
 								gint _tmp19_ = 0;
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								_tmp19_ = j;
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								j = _tmp19_ + 1;
-#line 4777 "AppWindow.c"
+#line 4788 "AppWindow.c"
 							}
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp18_ = FALSE;
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp20_ = j;
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp21_ = model_items;
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							if (!(_tmp20_ < _tmp21_)) {
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								break;
-#line 4789 "AppWindow.c"
+#line 4800 "AppWindow.c"
 							}
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp22_ = model;
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp23_ = j;
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp24_ = g_menu_model_get_item_link (_tmp22_, _tmp23_, G_MENU_LINK_SECTION);
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							subsection = _tmp24_;
-#line 807 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 808 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp25_ = subsection;
-#line 807 "/home/jens/Source/shotwell/src/AppWindow.vala"
-							if (_tmp25_ == NULL) {
 #line 808 "/home/jens/Source/shotwell/src/AppWindow.vala"
+							if (_tmp25_ == NULL) {
+#line 809 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								_g_object_unref0 (subsection);
-#line 808 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 809 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								continue;
-#line 4807 "AppWindow.c"
+#line 4818 "AppWindow.c"
 							}
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp26_ = subsection;
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp27_ = g_menu_model_get_n_items (_tmp26_);
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							sub_items = _tmp27_;
-#line 4815 "AppWindow.c"
+#line 4826 "AppWindow.c"
 							{
 								gint k = 0;
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								k = 0;
-#line 4820 "AppWindow.c"
+#line 4831 "AppWindow.c"
 								{
 									gboolean _tmp28_ = FALSE;
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 									_tmp28_ = TRUE;
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 									while (TRUE) {
-#line 4827 "AppWindow.c"
+#line 4838 "AppWindow.c"
 										gint _tmp30_ = 0;
 										gint _tmp31_ = 0;
 										GMenuAttributeIter* it = NULL;
 										GMenuModel* _tmp32_ = NULL;
 										gint _tmp33_ = 0;
 										GMenuAttributeIter* _tmp34_ = NULL;
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										if (!_tmp28_) {
-#line 4836 "AppWindow.c"
+#line 4847 "AppWindow.c"
 											gint _tmp29_ = 0;
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp29_ = k;
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											k = _tmp29_ + 1;
-#line 4842 "AppWindow.c"
+#line 4853 "AppWindow.c"
 										}
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp28_ = FALSE;
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp30_ = k;
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp31_ = sub_items;
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										if (!(_tmp30_ < _tmp31_)) {
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											break;
-#line 4854 "AppWindow.c"
+#line 4865 "AppWindow.c"
 										}
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp32_ = subsection;
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp33_ = k;
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp34_ = g_menu_model_iterate_item_attributes (_tmp32_, _tmp33_);
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
-										it = _tmp34_;
 #line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+										it = _tmp34_;
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										while (TRUE) {
-#line 4866 "AppWindow.c"
+#line 4877 "AppWindow.c"
 											GMenuAttributeIter* _tmp35_ = NULL;
 											gboolean _tmp36_ = FALSE;
 											gboolean _tmp37_ = FALSE;
 											gboolean _tmp38_ = FALSE;
 											GMenuAttributeIter* _tmp39_ = NULL;
 											const gchar* _tmp40_ = NULL;
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp35_ = it;
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp36_ = g_menu_attribute_iter_next (_tmp35_);
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (!_tmp36_) {
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												break;
-#line 4881 "AppWindow.c"
+#line 4892 "AppWindow.c"
 											}
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp39_ = it;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp40_ = g_menu_attribute_iter_get_name (_tmp39_);
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (g_strcmp0 (_tmp40_, "id") == 0) {
-#line 4889 "AppWindow.c"
+#line 4900 "AppWindow.c"
 												GMenuAttributeIter* _tmp41_ = NULL;
 												GVariant* _tmp42_ = NULL;
 												GVariant* _tmp43_ = NULL;
 												const gchar* _tmp44_ = NULL;
 												const gchar* _tmp45_ = NULL;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp41_ = it;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp42_ = g_menu_attribute_iter_get_value (_tmp41_);
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp43_ = _tmp42_;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp44_ = g_variant_get_string (_tmp43_, NULL);
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp45_ = id;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp38_ = g_strcmp0 (_tmp44_, _tmp45_) == 0;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_variant_unref0 (_tmp43_);
-#line 4909 "AppWindow.c"
+#line 4920 "AppWindow.c"
 											} else {
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp38_ = FALSE;
-#line 4913 "AppWindow.c"
+#line 4924 "AppWindow.c"
 											}
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (_tmp38_) {
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp37_ = TRUE;
-#line 4919 "AppWindow.c"
+#line 4930 "AppWindow.c"
 											} else {
 												gboolean _tmp46_ = FALSE;
 												GMenuAttributeIter* _tmp47_ = NULL;
 												const gchar* _tmp48_ = NULL;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp47_ = it;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp48_ = g_menu_attribute_iter_get_name (_tmp47_);
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												if (g_strcmp0 (_tmp48_, "action") == 0) {
-#line 4930 "AppWindow.c"
+#line 4941 "AppWindow.c"
 													GMenuAttributeIter* _tmp49_ = NULL;
 													GVariant* _tmp50_ = NULL;
 													GVariant* _tmp51_ = NULL;
@@ -4967,41 +4978,41 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 													gchar* _tmp54_ = NULL;
 													gchar* _tmp55_ = NULL;
 													gboolean _tmp56_ = FALSE;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp49_ = it;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp50_ = g_menu_attribute_iter_get_value (_tmp49_);
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp51_ = _tmp50_;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp52_ = g_variant_get_string (_tmp51_, NULL);
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp53_ = id;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp54_ = g_strconcat (".", _tmp53_, NULL);
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp55_ = _tmp54_;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp56_ = g_str_has_suffix (_tmp52_, _tmp55_);
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp46_ = _tmp56_;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_g_free0 (_tmp55_);
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_g_variant_unref0 (_tmp51_);
-#line 4961 "AppWindow.c"
+#line 4972 "AppWindow.c"
 												} else {
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp46_ = FALSE;
-#line 4965 "AppWindow.c"
+#line 4976 "AppWindow.c"
 												}
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp37_ = _tmp46_;
-#line 4969 "AppWindow.c"
+#line 4980 "AppWindow.c"
 											}
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (_tmp37_) {
-#line 4973 "AppWindow.c"
+#line 4984 "AppWindow.c"
 												GMenu* md = NULL;
 												GMenuModel* _tmp57_ = NULL;
 												GMenu* _tmp58_ = NULL;
@@ -5016,85 +5027,85 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 												GMenu* _tmp66_ = NULL;
 												gint _tmp67_ = 0;
 												GMenuItem* _tmp68_ = NULL;
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp57_ = subsection;
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp58_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp57_, g_menu_get_type ()) ? ((GMenu*) _tmp57_) : NULL);
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
-												md = _tmp58_;
 #line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												md = _tmp58_;
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp59_ = subsection;
-#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp60_ = k;
-#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp61_ = g_menu_item_new_from_model (_tmp59_, _tmp60_);
-#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
-												m = _tmp61_;
 #line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												m = _tmp61_;
+#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp62_ = m;
-#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp63_ = new_label;
-#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
-												g_menu_item_set_label (_tmp62_, _tmp63_);
 #line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												g_menu_item_set_label (_tmp62_, _tmp63_);
+#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp64_ = md;
-#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp65_ = k;
-#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
-												g_menu_remove (_tmp64_, _tmp65_);
 #line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												g_menu_remove (_tmp64_, _tmp65_);
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp66_ = md;
-#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp67_ = k;
-#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp68_ = m;
-#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												g_menu_insert_item (_tmp66_, _tmp67_, _tmp68_);
-#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (m);
-#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (md);
-#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (it);
-#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (subsection);
-#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (model);
-#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (bar);
-#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												return;
-#line 5036 "AppWindow.c"
+#line 5047 "AppWindow.c"
 											}
 										}
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_g_object_unref0 (it);
-#line 5041 "AppWindow.c"
+#line 5052 "AppWindow.c"
 									}
 								}
 							}
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_g_object_unref0 (subsection);
-#line 5047 "AppWindow.c"
+#line 5058 "AppWindow.c"
 						}
 					}
 				}
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_g_object_unref0 (model);
-#line 5053 "AppWindow.c"
+#line 5064 "AppWindow.c"
 			}
 		}
 	}
-#line 788 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (bar);
-#line 5059 "AppWindow.c"
+#line 5070 "AppWindow.c"
 }
 
 
 static gpointer _command_manager_ref0 (gpointer self) {
-#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self ? command_manager_ref (self) : NULL;
-#line 5066 "AppWindow.c"
+#line 5077 "AppWindow.c"
 }
 
 
@@ -5102,26 +5113,26 @@ CommandManager* app_window_get_command_manager (void) {
 	CommandManager* result = NULL;
 	CommandManager* _tmp0_ = NULL;
 	CommandManager* _tmp1_ = NULL;
-#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_command_manager;
-#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _command_manager_ref0 (_tmp0_);
-#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp1_;
-#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 5082 "AppWindow.c"
+#line 5093 "AppWindow.c"
 }
 
 
 static void app_window_on_command_manager_altered (AppWindow* self) {
-#line 837 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_decorate_undo_action (self);
+	g_return_if_fail (IS_APP_WINDOW (self));
 #line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_decorate_undo_action (self);
+#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_redo_action (self);
-#line 5093 "AppWindow.c"
+#line 5104 "AppWindow.c"
 }
 
 
@@ -5137,51 +5148,51 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
 	CommandDescription* _tmp6_ = NULL;
 	const gchar* _tmp18_ = NULL;
 	const gchar* _tmp19_ = NULL;
-#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (name != NULL);
-#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (prefix != NULL);
-#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (default_explanation != NULL);
-#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((desc == NULL) || IS_COMMAND_DESCRIPTION (desc));
-#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ == NULL) {
-#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 5129 "AppWindow.c"
+#line 5140 "AppWindow.c"
 	}
-#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	action = _tmp2_;
 #line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	action = _tmp2_;
+#line 846 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = action;
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp3_ == NULL) {
 #line 846 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp3_ == NULL) {
+#line 847 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (action);
-#line 846 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 847 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 5141 "AppWindow.c"
+#line 5152 "AppWindow.c"
 	}
-#line 849 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = prefix;
-#line 849 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 849 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	label = _tmp5_;
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = desc;
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 5153 "AppWindow.c"
+#line 5164 "AppWindow.c"
 		const gchar* _tmp7_ = NULL;
 		CommandDescription* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
@@ -5190,62 +5201,62 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		GSimpleAction* _tmp14_ = NULL;
-#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = label;
-#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = desc;
-#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = command_description_get_name (_tmp8_);
-#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = g_strconcat (" ", _tmp10_, NULL);
-#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = _tmp11_;
-#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp13_ = g_strconcat (_tmp7_, _tmp12_, NULL);
-#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (label);
-#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		label = _tmp13_;
-#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp12_);
-#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_free0 (_tmp10_);
 #line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_g_free0 (_tmp10_);
+#line 854 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp14_ = action;
-#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 854 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp14_, TRUE);
-#line 5188 "AppWindow.c"
+#line 5199 "AppWindow.c"
 	} else {
 		const gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
 		GSimpleAction* _tmp17_ = NULL;
-#line 855 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp15_ = prefix;
-#line 855 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp16_ = g_strdup (_tmp15_);
-#line 855 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (label);
-#line 855 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		label = _tmp16_;
 #line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		label = _tmp16_;
+#line 857 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp17_ = action;
-#line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 857 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp17_, FALSE);
-#line 5205 "AppWindow.c"
+#line 5216 "AppWindow.c"
 	}
-#line 858 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp18_ = name;
-#line 858 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp19_ = label;
-#line 858 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_update_menu_item_label (self, _tmp18_, _tmp19_);
-#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (label);
-#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 5217 "AppWindow.c"
+#line 5228 "AppWindow.c"
 }
 
 
@@ -5254,23 +5265,23 @@ void app_window_decorate_undo_action (AppWindow* self) {
 	CommandManager* _tmp1_ = NULL;
 	CommandDescription* _tmp2_ = NULL;
 	CommandDescription* _tmp3_ = NULL;
-#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #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"
 	_tmp0_ = app_window_get_command_manager ();
-#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 863 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 863 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = command_manager_get_undo_description (_tmp1_);
-#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 863 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 863 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_command_manager_action (self, "CommonUndo", RESOURCES_UNDO_MENU, "", _tmp3_);
-#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 863 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 863 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 5242 "AppWindow.c"
+#line 5253 "AppWindow.c"
 }
 
 
@@ -5279,47 +5290,47 @@ void app_window_decorate_redo_action (AppWindow* self) {
 	CommandManager* _tmp1_ = NULL;
 	CommandDescription* _tmp2_ = NULL;
 	CommandDescription* _tmp3_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #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"
 	_tmp0_ = app_window_get_command_manager ();
-#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = command_manager_get_redo_description (_tmp1_);
-#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_command_manager_action (self, "CommonRedo", RESOURCES_REDO_MENU, "", _tmp3_);
-#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 5267 "AppWindow.c"
+#line 5278 "AppWindow.c"
 }
 
 
 static void app_window_on_undo (AppWindow* self) {
 	CommandManager* _tmp0_ = NULL;
-#line 871 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #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 872 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 873 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	command_manager_undo (_tmp0_);
-#line 5279 "AppWindow.c"
+#line 5290 "AppWindow.c"
 }
 
 
 static void app_window_on_redo (AppWindow* self) {
 	CommandManager* _tmp0_ = NULL;
-#line 875 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #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 876 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	command_manager_redo (_tmp0_);
-#line 5291 "AppWindow.c"
+#line 5302 "AppWindow.c"
 }
 
 
@@ -5328,43 +5339,43 @@ static void app_window_on_select_all (AppWindow* self) {
 	Page* _tmp0_ = NULL;
 	CheckerboardPage* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
-#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #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"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp0_) : NULL;
-#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ == NULL) {
-#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 5310 "AppWindow.c"
+#line 5321 "AppWindow.c"
 	}
-#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
 #line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
+#line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page;
-#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 5318 "AppWindow.c"
+#line 5329 "AppWindow.c"
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
-#line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
-#line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		view_collection_select_all (_tmp5_);
-#line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 5332 "AppWindow.c"
+#line 5343 "AppWindow.c"
 	}
-#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 5336 "AppWindow.c"
+#line 5347 "AppWindow.c"
 }
 
 
@@ -5373,43 +5384,43 @@ static void app_window_on_select_none (AppWindow* self) {
 	Page* _tmp0_ = NULL;
 	CheckerboardPage* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
-#line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #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"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp0_) : NULL;
-#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ == NULL) {
-#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 5355 "AppWindow.c"
+#line 5366 "AppWindow.c"
 	}
-#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
 #line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
+#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page;
-#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 5363 "AppWindow.c"
+#line 5374 "AppWindow.c"
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
-#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
-#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		view_collection_unselect_all (_tmp5_);
-#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 5377 "AppWindow.c"
+#line 5388 "AppWindow.c"
 	}
-#line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 5381 "AppWindow.c"
+#line 5392 "AppWindow.c"
 }
 
 
@@ -5421,40 +5432,40 @@ static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfig
 	gboolean _tmp2_ = FALSE;
 	GdkEventConfigure* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
-#line 891 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
-#line 891 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
 #line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_val_if_fail (event != NULL, FALSE);
+#line 893 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 893 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gdk_window_get_state (_tmp0_);
-#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 893 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->maximized = _tmp1_ == GDK_WINDOW_STATE_MAXIMIZED;
-#line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->maximized;
-#line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp2_) {
-#line 5407 "AppWindow.c"
+#line 5418 "AppWindow.c"
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_window_get_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), &_tmp3_, &_tmp4_);
-#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->dimensions.width = _tmp3_;
-#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->dimensions.height = _tmp4_;
-#line 5416 "AppWindow.c"
+#line 5427 "AppWindow.c"
 	}
-#line 897 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 898 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = event;
-#line 897 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 898 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = GTK_WIDGET_CLASS (app_window_parent_class)->configure_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp5_);
-#line 897 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 898 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp6_;
-#line 897 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 898 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 5426 "AppWindow.c"
+#line 5437 "AppWindow.c"
 }
 
 
@@ -5462,26 +5473,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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 5453 "AppWindow.c"
+#line 5464 "AppWindow.c"
 }
 
 
@@ -5492,7 +5503,7 @@ 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 5464 "AppWindow.c"
+#line 5475 "AppWindow.c"
 }
 
 
@@ -5502,7 +5513,7 @@ static void app_window_finalize (GObject* obj) {
 	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 5474 "AppWindow.c"
+#line 5485 "AppWindow.c"
 }
 
 
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index a151c9a..bfdfcaf 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -592,7 +592,8 @@ public abstract class AppWindow : PageWindow {
     protected void on_about() {
         const string[] artists = { "Aachen logo under public domain license https://www.flickr.com/photos/30784528@N04/10860988196/", null };
         Gtk.show_about_dialog(this,
-            "version", Resources.APP_VERSION + " \u2013 \"Aachen\"",
+            // translators: %s will be replaced by application version
+            "version", _("%s \u2013 “Aachen”".printf(Resources.APP_VERSION)),
             "comments", get_app_role(),
             "copyright", Resources.COPYRIGHT,
             "website", Resources.HOME_URL,
diff --git a/src/Application.c b/src/Application.c
index edc55d2..7405100 100644
--- a/src/Application.c
+++ b/src/Application.c
@@ -1,4 +1,4 @@
-/* Application.c generated by valac 0.34.4, the Vala compiler
+/* Application.c generated by valac 0.34.7, the Vala compiler
  * generated from Application.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/BatchImport.c b/src/BatchImport.c
index 5904344..382a63c 100644
--- a/src/BatchImport.c
+++ b/src/BatchImport.c
@@ -1,4 +1,4 @@
-/* BatchImport.c generated by valac 0.34.4, the Vala compiler
+/* BatchImport.c generated by valac 0.34.7, the Vala compiler
  * generated from BatchImport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2961,11 +2961,12 @@ gchar* batch_import_job_get_source_identifier (BatchImportJob* self) {
 
 
 static gboolean batch_import_job_real_is_directory (BatchImportJob* self) {
+	gboolean _tmp0_ = FALSE;
 #line 165 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	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 FALSE;
-#line 2969 "BatchImport.c"
+	return _tmp0_;
+#line 2970 "BatchImport.c"
 }
 
 
@@ -2974,7 +2975,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 2978 "BatchImport.c"
+#line 2979 "BatchImport.c"
 }
 
 
@@ -2983,7 +2984,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 2987 "BatchImport.c"
+#line 2988 "BatchImport.c"
 }
 
 
@@ -2992,7 +2993,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 2996 "BatchImport.c"
+#line 2997 "BatchImport.c"
 }
 
 
@@ -3001,7 +3002,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 3005 "BatchImport.c"
+#line 3006 "BatchImport.c"
 }
 
 
@@ -3010,7 +3011,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 3014 "BatchImport.c"
+#line 3015 "BatchImport.c"
 }
 
 
@@ -3020,7 +3021,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 3024 "BatchImport.c"
+#line 3025 "BatchImport.c"
 }
 
 
@@ -3029,7 +3030,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 3033 "BatchImport.c"
+#line 3034 "BatchImport.c"
 }
 
 
@@ -3038,7 +3039,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 3042 "BatchImport.c"
+#line 3043 "BatchImport.c"
 }
 
 
@@ -3047,16 +3048,17 @@ 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 3051 "BatchImport.c"
+#line 3052 "BatchImport.c"
 }
 
 
 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 FALSE;
-#line 3060 "BatchImport.c"
+	return _tmp0_;
+#line 3062 "BatchImport.c"
 }
 
 
@@ -3065,16 +3067,17 @@ gboolean batch_import_job_determine_file_size (BatchImportJob* self, guint64* fi
 	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 3069 "BatchImport.c"
+#line 3071 "BatchImport.c"
 }
 
 
 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 FALSE;
-#line 3078 "BatchImport.c"
+	return _tmp0_;
+#line 3081 "BatchImport.c"
 }
 
 
@@ -3083,7 +3086,7 @@ gboolean batch_import_job_prepare (BatchImportJob* self, GFile** file_to_import,
 	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 3087 "BatchImport.c"
+#line 3090 "BatchImport.c"
 }
 
 
@@ -3097,7 +3100,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 3101 "BatchImport.c"
+#line 3104 "BatchImport.c"
 }
 
 
@@ -3106,7 +3109,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 3110 "BatchImport.c"
+#line 3113 "BatchImport.c"
 }
 
 
@@ -3116,7 +3119,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 3120 "BatchImport.c"
+#line 3123 "BatchImport.c"
 }
 
 
@@ -3125,7 +3128,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 3129 "BatchImport.c"
+#line 3132 "BatchImport.c"
 }
 
 
@@ -3135,14 +3138,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 3139 "BatchImport.c"
+#line 3142 "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 3146 "BatchImport.c"
+#line 3149 "BatchImport.c"
 }
 
 
@@ -3151,7 +3154,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 3155 "BatchImport.c"
+#line 3158 "BatchImport.c"
 	}
 }
 
@@ -3161,11 +3164,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 3165 "BatchImport.c"
+#line 3168 "BatchImport.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3169 "BatchImport.c"
+#line 3172 "BatchImport.c"
 	}
 }
 
@@ -3173,37 +3176,37 @@ 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 3177 "BatchImport.c"
+#line 3180 "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 3184 "BatchImport.c"
+#line 3187 "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 3191 "BatchImport.c"
+#line 3194 "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 3195 "BatchImport.c"
+#line 3198 "BatchImport.c"
 		}
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = batch_import_job_ref (object);
-#line 3199 "BatchImport.c"
+#line 3202 "BatchImport.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3203 "BatchImport.c"
+#line 3206 "BatchImport.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 3207 "BatchImport.c"
+#line 3210 "BatchImport.c"
 }
 
 
@@ -3214,25 +3217,25 @@ static gchar* value_batch_import_job_lcopy_value (const GValue* value, guint n_c
 	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 3218 "BatchImport.c"
+#line 3221 "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 3224 "BatchImport.c"
+#line 3227 "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 3228 "BatchImport.c"
+#line 3231 "BatchImport.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = batch_import_job_ref (value->data[0].v_pointer);
-#line 3232 "BatchImport.c"
+#line 3235 "BatchImport.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 3236 "BatchImport.c"
+#line 3239 "BatchImport.c"
 }
 
 
@@ -3246,7 +3249,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 3250 "BatchImport.c"
+#line 3253 "BatchImport.c"
 }
 
 
@@ -3255,7 +3258,7 @@ 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 3259 "BatchImport.c"
+#line 3262 "BatchImport.c"
 }
 
 
@@ -3275,17 +3278,17 @@ 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 3279 "BatchImport.c"
+#line 3282 "BatchImport.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3283 "BatchImport.c"
+#line 3286 "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 3289 "BatchImport.c"
+#line 3292 "BatchImport.c"
 	}
 }
 
@@ -3304,17 +3307,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 3308 "BatchImport.c"
+#line 3311 "BatchImport.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3312 "BatchImport.c"
+#line 3315 "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 3318 "BatchImport.c"
+#line 3321 "BatchImport.c"
 	}
 }
 
@@ -3325,35 +3328,35 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = batch_import_job_real_get_exposure_time_override;
-#line 3350 "BatchImport.c"
+	((BatchImportJobClass *) klass)->get_exposure_time_override = (time_t (*)(BatchImportJob*)) batch_import_job_real_get_exposure_time_override;
+#line 3353 "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 3357 "BatchImport.c"
+#line 3360 "BatchImport.c"
 }
 
 
@@ -3363,7 +3366,7 @@ static void batch_import_job_finalize (BatchImportJob* obj) {
 	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 3367 "BatchImport.c"
+#line 3370 "BatchImport.c"
 }
 
 
@@ -3388,7 +3391,7 @@ gpointer batch_import_job_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 3392 "BatchImport.c"
+#line 3395 "BatchImport.c"
 }
 
 
@@ -3401,7 +3404,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 3405 "BatchImport.c"
+#line 3408 "BatchImport.c"
 	}
 }
 
@@ -3409,7 +3412,7 @@ 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 3413 "BatchImport.c"
+#line 3416 "BatchImport.c"
 }
 
 
@@ -3436,14 +3439,14 @@ 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 3440 "BatchImport.c"
+#line 3443 "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 3447 "BatchImport.c"
+#line 3450 "BatchImport.c"
 }
 
 
@@ -3462,7 +3465,7 @@ 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 3466 "BatchImport.c"
+#line 3469 "BatchImport.c"
 }
 
 
@@ -3481,7 +3484,7 @@ 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 3485 "BatchImport.c"
+#line 3488 "BatchImport.c"
 }
 
 
@@ -3500,7 +3503,7 @@ static gboolean file_import_job_real_is_directory (BatchImportJob* base) {
 	result = _tmp1_;
 #line 226 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3504 "BatchImport.c"
+#line 3507 "BatchImport.c"
 }
 
 
@@ -3519,7 +3522,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 3523 "BatchImport.c"
+#line 3526 "BatchImport.c"
 }
 
 
@@ -3534,7 +3537,7 @@ static gchar* file_import_job_real_get_path (BatchImportJob* base) {
 	_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 3538 "BatchImport.c"
+#line 3541 "BatchImport.c"
 		GFile* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 #line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -3545,7 +3548,7 @@ 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 3549 "BatchImport.c"
+#line 3552 "BatchImport.c"
 	} else {
 		GFile* _tmp4_ = NULL;
 		GFile* _tmp5_ = NULL;
@@ -3565,20 +3568,20 @@ 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 3569 "BatchImport.c"
+#line 3572 "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 3575 "BatchImport.c"
+#line 3578 "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 3582 "BatchImport.c"
+#line 3585 "BatchImport.c"
 }
 
 
@@ -3598,7 +3601,7 @@ 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 3602 "BatchImport.c"
+#line 3605 "BatchImport.c"
 }
 
 
@@ -3627,21 +3630,21 @@ 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 3631 "BatchImport.c"
+#line 3634 "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 3637 "BatchImport.c"
+#line 3640 "BatchImport.c"
 	} else {
 #line 245 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_vala_file);
-#line 3641 "BatchImport.c"
+#line 3644 "BatchImport.c"
 	}
 #line 245 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3645 "BatchImport.c"
+#line 3648 "BatchImport.c"
 }
 
 
@@ -3673,21 +3676,21 @@ 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 3677 "BatchImport.c"
+#line 3680 "BatchImport.c"
 	} else {
 #line 252 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_vala_file_to_import);
-#line 3681 "BatchImport.c"
+#line 3684 "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 3687 "BatchImport.c"
+#line 3690 "BatchImport.c"
 	}
 #line 252 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3691 "BatchImport.c"
+#line 3694 "BatchImport.c"
 }
 
 
@@ -3705,7 +3708,7 @@ GFile* file_import_job_get_file (FileImportJob* self) {
 	result = _tmp1_;
 #line 256 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3709 "BatchImport.c"
+#line 3712 "BatchImport.c"
 }
 
 
@@ -3717,22 +3720,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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = file_import_job_real_prepare;
-#line 3736 "BatchImport.c"
+	((BatchImportJobClass *) klass)->prepare = (gboolean (*)(BatchImportJob*, GFile**, gboolean*, GError**)) file_import_job_real_prepare;
+#line 3739 "BatchImport.c"
 }
 
 
@@ -3741,7 +3744,7 @@ 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 3745 "BatchImport.c"
+#line 3748 "BatchImport.c"
 }
 
 
@@ -3755,7 +3758,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 3759 "BatchImport.c"
+#line 3762 "BatchImport.c"
 }
 
 
@@ -3782,21 +3785,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 3786 "BatchImport.c"
+#line 3789 "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 3793 "BatchImport.c"
+#line 3796 "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 3800 "BatchImport.c"
+#line 3803 "BatchImport.c"
 }
 
 
@@ -3805,7 +3808,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 3809 "BatchImport.c"
+#line 3812 "BatchImport.c"
 	}
 }
 
@@ -3815,11 +3818,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 3819 "BatchImport.c"
+#line 3822 "BatchImport.c"
 	} else {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3823 "BatchImport.c"
+#line 3826 "BatchImport.c"
 	}
 }
 
@@ -3827,37 +3830,37 @@ 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 3831 "BatchImport.c"
+#line 3834 "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 3838 "BatchImport.c"
+#line 3841 "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 3845 "BatchImport.c"
+#line 3848 "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 3849 "BatchImport.c"
+#line 3852 "BatchImport.c"
 		}
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = batch_import_roll_ref (object);
-#line 3853 "BatchImport.c"
+#line 3856 "BatchImport.c"
 	} else {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3857 "BatchImport.c"
+#line 3860 "BatchImport.c"
 	}
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 3861 "BatchImport.c"
+#line 3864 "BatchImport.c"
 }
 
 
@@ -3868,25 +3871,25 @@ static gchar* value_batch_import_roll_lcopy_value (const GValue* value, guint n_
 	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 3872 "BatchImport.c"
+#line 3875 "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 3878 "BatchImport.c"
+#line 3881 "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 3882 "BatchImport.c"
+#line 3885 "BatchImport.c"
 	} else {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = batch_import_roll_ref (value->data[0].v_pointer);
-#line 3886 "BatchImport.c"
+#line 3889 "BatchImport.c"
 	}
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 3890 "BatchImport.c"
+#line 3893 "BatchImport.c"
 }
 
 
@@ -3900,7 +3903,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 3904 "BatchImport.c"
+#line 3907 "BatchImport.c"
 }
 
 
@@ -3909,7 +3912,7 @@ 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 3913 "BatchImport.c"
+#line 3916 "BatchImport.c"
 }
 
 
@@ -3929,17 +3932,17 @@ 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 3933 "BatchImport.c"
+#line 3936 "BatchImport.c"
 	} else {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3937 "BatchImport.c"
+#line 3940 "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 3943 "BatchImport.c"
+#line 3946 "BatchImport.c"
 	}
 }
 
@@ -3958,17 +3961,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 3962 "BatchImport.c"
+#line 3965 "BatchImport.c"
 	} else {
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3966 "BatchImport.c"
+#line 3969 "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 3972 "BatchImport.c"
+#line 3975 "BatchImport.c"
 	}
 }
 
@@ -3978,7 +3981,7 @@ 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 3982 "BatchImport.c"
+#line 3985 "BatchImport.c"
 }
 
 
@@ -3990,7 +3993,7 @@ static void batch_import_roll_instance_init (BatchImportRoll * self) {
 	self->generated_events = _tmp0_;
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 3994 "BatchImport.c"
+#line 3997 "BatchImport.c"
 }
 
 
@@ -4002,7 +4005,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 4006 "BatchImport.c"
+#line 4009 "BatchImport.c"
 }
 
 
@@ -4027,7 +4030,7 @@ gpointer batch_import_roll_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 4031 "BatchImport.c"
+#line 4034 "BatchImport.c"
 }
 
 
@@ -4040,7 +4043,7 @@ 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 4044 "BatchImport.c"
+#line 4047 "BatchImport.c"
 	}
 }
 
@@ -4116,14 +4119,14 @@ BatchImportResult* batch_import_result_construct (GType object_type, BatchImport
 	self->result = _tmp10_;
 #line 287 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 4120 "BatchImport.c"
+#line 4123 "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 4127 "BatchImport.c"
+#line 4130 "BatchImport.c"
 }
 
 
@@ -4205,21 +4208,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 4209 "BatchImport.c"
+#line 4212 "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 4216 "BatchImport.c"
+#line 4219 "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 4223 "BatchImport.c"
+#line 4226 "BatchImport.c"
 }
 
 
@@ -4228,7 +4231,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 4232 "BatchImport.c"
+#line 4235 "BatchImport.c"
 	}
 }
 
@@ -4238,11 +4241,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 4242 "BatchImport.c"
+#line 4245 "BatchImport.c"
 	} else {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4246 "BatchImport.c"
+#line 4249 "BatchImport.c"
 	}
 }
 
@@ -4250,37 +4253,37 @@ 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 4254 "BatchImport.c"
+#line 4257 "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 4261 "BatchImport.c"
+#line 4264 "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 4268 "BatchImport.c"
+#line 4271 "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 4272 "BatchImport.c"
+#line 4275 "BatchImport.c"
 		}
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = batch_import_result_ref (object);
-#line 4276 "BatchImport.c"
+#line 4279 "BatchImport.c"
 	} else {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4280 "BatchImport.c"
+#line 4283 "BatchImport.c"
 	}
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 4284 "BatchImport.c"
+#line 4287 "BatchImport.c"
 }
 
 
@@ -4291,25 +4294,25 @@ static gchar* value_batch_import_result_lcopy_value (const GValue* value, guint
 	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 4295 "BatchImport.c"
+#line 4298 "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 4301 "BatchImport.c"
+#line 4304 "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 4305 "BatchImport.c"
+#line 4308 "BatchImport.c"
 	} else {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = batch_import_result_ref (value->data[0].v_pointer);
-#line 4309 "BatchImport.c"
+#line 4312 "BatchImport.c"
 	}
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 4313 "BatchImport.c"
+#line 4316 "BatchImport.c"
 }
 
 
@@ -4323,7 +4326,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 4327 "BatchImport.c"
+#line 4330 "BatchImport.c"
 }
 
 
@@ -4332,7 +4335,7 @@ 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 4336 "BatchImport.c"
+#line 4339 "BatchImport.c"
 }
 
 
@@ -4352,17 +4355,17 @@ 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 4356 "BatchImport.c"
+#line 4359 "BatchImport.c"
 	} else {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4360 "BatchImport.c"
+#line 4363 "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 4366 "BatchImport.c"
+#line 4369 "BatchImport.c"
 	}
 }
 
@@ -4381,17 +4384,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 4385 "BatchImport.c"
+#line 4388 "BatchImport.c"
 	} else {
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4389 "BatchImport.c"
+#line 4392 "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 4395 "BatchImport.c"
+#line 4398 "BatchImport.c"
 	}
 }
 
@@ -4401,7 +4404,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 4405 "BatchImport.c"
+#line 4408 "BatchImport.c"
 }
 
 
@@ -4410,7 +4413,7 @@ 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 4414 "BatchImport.c"
+#line 4417 "BatchImport.c"
 }
 
 
@@ -4432,7 +4435,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 4436 "BatchImport.c"
+#line 4439 "BatchImport.c"
 }
 
 
@@ -4457,7 +4460,7 @@ gpointer batch_import_result_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 4461 "BatchImport.c"
+#line 4464 "BatchImport.c"
 }
 
 
@@ -4470,7 +4473,7 @@ 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 4474 "BatchImport.c"
+#line 4477 "BatchImport.c"
 	}
 }
 
@@ -4489,7 +4492,7 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed
 	_tmp0_ = prefailed;
 #line 323 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_ != NULL) {
-#line 4493 "BatchImport.c"
+#line 4496 "BatchImport.c"
 		{
 			GeeList* _job_list = NULL;
 			GeeList* _tmp1_ = NULL;
@@ -4517,7 +4520,7 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed
 			_job_index = -1;
 #line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			while (TRUE) {
-#line 4521 "BatchImport.c"
+#line 4524 "BatchImport.c"
 				gint _tmp6_ = 0;
 				gint _tmp7_ = 0;
 				gint _tmp8_ = 0;
@@ -4548,7 +4551,7 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed
 				if (!(_tmp7_ < _tmp8_)) {
 #line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					break;
-#line 4552 "BatchImport.c"
+#line 4555 "BatchImport.c"
 				}
 #line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp9_ = _job_list;
@@ -4590,18 +4593,18 @@ 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 4594 "BatchImport.c"
+#line 4597 "BatchImport.c"
 			}
 #line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_job_list);
-#line 4598 "BatchImport.c"
+#line 4601 "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 4605 "BatchImport.c"
+#line 4608 "BatchImport.c"
 		{
 			GeeList* _job_list = NULL;
 			GeeList* _tmp23_ = NULL;
@@ -4629,7 +4632,7 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed
 			_job_index = -1;
 #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			while (TRUE) {
-#line 4633 "BatchImport.c"
+#line 4636 "BatchImport.c"
 				gint _tmp28_ = 0;
 				gint _tmp29_ = 0;
 				gint _tmp30_ = 0;
@@ -4668,7 +4671,7 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed
 				if (!(_tmp29_ < _tmp30_)) {
 #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					break;
-#line 4672 "BatchImport.c"
+#line 4675 "BatchImport.c"
 				}
 #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp31_ = _job_list;
@@ -4732,23 +4735,23 @@ 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 4736 "BatchImport.c"
+#line 4739 "BatchImport.c"
 			}
 #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_job_list);
-#line 4740 "BatchImport.c"
+#line 4743 "BatchImport.c"
 		}
 	}
 #line 321 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 4745 "BatchImport.c"
+#line 4748 "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 4752 "BatchImport.c"
+#line 4755 "BatchImport.c"
 }
 
 
@@ -4771,7 +4774,7 @@ 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 4775 "BatchImport.c"
+#line 4778 "BatchImport.c"
 		{
 			GeeList* _tmp2_ = NULL;
 			BatchImportResult* _tmp3_ = NULL;
@@ -4783,11 +4786,11 @@ 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 4787 "BatchImport.c"
+#line 4790 "BatchImport.c"
 		}
 #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_USER_ABORT:
-#line 4791 "BatchImport.c"
+#line 4794 "BatchImport.c"
 		{
 			gboolean _tmp4_ = FALSE;
 			BatchImportResult* _tmp5_ = NULL;
@@ -4798,7 +4801,7 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
 			_tmp6_ = _tmp5_->file;
 #line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp6_ != NULL) {
-#line 4802 "BatchImport.c"
+#line 4805 "BatchImport.c"
 				BatchImportResult* _tmp7_ = NULL;
 				GFile* _tmp8_ = NULL;
 				gboolean _tmp9_ = FALSE;
@@ -4810,15 +4813,15 @@ 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 4814 "BatchImport.c"
+#line 4817 "BatchImport.c"
 			} else {
 #line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp4_ = FALSE;
-#line 4818 "BatchImport.c"
+#line 4821 "BatchImport.c"
 			}
 #line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp4_) {
-#line 4822 "BatchImport.c"
+#line 4825 "BatchImport.c"
 				GeeList* _tmp10_ = NULL;
 				BatchImportResult* _tmp11_ = NULL;
 #line 354 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4827,19 +4830,19 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
 				_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 4831 "BatchImport.c"
+#line 4834 "BatchImport.c"
 			} else {
 #line 356 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				reported = FALSE;
-#line 4835 "BatchImport.c"
+#line 4838 "BatchImport.c"
 			}
 #line 357 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4839 "BatchImport.c"
+#line 4842 "BatchImport.c"
 		}
 #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_UNSUPPORTED_FORMAT:
-#line 4843 "BatchImport.c"
+#line 4846 "BatchImport.c"
 		{
 			GeeList* _tmp12_ = NULL;
 			BatchImportResult* _tmp13_ = NULL;
@@ -4851,13 +4854,13 @@ 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 4855 "BatchImport.c"
+#line 4858 "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 4861 "BatchImport.c"
+#line 4864 "BatchImport.c"
 		{
 			GeeList* _tmp14_ = NULL;
 			BatchImportResult* _tmp15_ = NULL;
@@ -4869,11 +4872,11 @@ 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 4873 "BatchImport.c"
+#line 4876 "BatchImport.c"
 		}
 #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_PHOTO_EXISTS:
-#line 4877 "BatchImport.c"
+#line 4880 "BatchImport.c"
 		{
 			GeeList* _tmp16_ = NULL;
 			BatchImportResult* _tmp17_ = NULL;
@@ -4885,11 +4888,11 @@ 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 4889 "BatchImport.c"
+#line 4892 "BatchImport.c"
 		}
 #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_CAMERA_ERROR:
-#line 4893 "BatchImport.c"
+#line 4896 "BatchImport.c"
 		{
 			GeeList* _tmp18_ = NULL;
 			BatchImportResult* _tmp19_ = NULL;
@@ -4901,11 +4904,11 @@ 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 4905 "BatchImport.c"
+#line 4908 "BatchImport.c"
 		}
 #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_FILE_WRITE_ERROR:
-#line 4909 "BatchImport.c"
+#line 4912 "BatchImport.c"
 		{
 			GeeList* _tmp20_ = NULL;
 			BatchImportResult* _tmp21_ = NULL;
@@ -4917,11 +4920,11 @@ 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 4921 "BatchImport.c"
+#line 4924 "BatchImport.c"
 		}
 #line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_PIXBUF_CORRUPT_IMAGE:
-#line 4925 "BatchImport.c"
+#line 4928 "BatchImport.c"
 		{
 			GeeList* _tmp22_ = NULL;
 			BatchImportResult* _tmp23_ = NULL;
@@ -4933,7 +4936,7 @@ 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 4937 "BatchImport.c"
+#line 4940 "BatchImport.c"
 		}
 		default:
 		{
@@ -4947,14 +4950,14 @@ 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 4951 "BatchImport.c"
+#line 4954 "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 4958 "BatchImport.c"
+#line 4961 "BatchImport.c"
 		GeeList* _tmp27_ = NULL;
 		BatchImportResult* _tmp28_ = NULL;
 #line 390 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4963,7 +4966,7 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
 		_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 4967 "BatchImport.c"
+#line 4970 "BatchImport.c"
 	}
 }
 
@@ -4971,7 +4974,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 4975 "BatchImport.c"
+#line 4978 "BatchImport.c"
 }
 
 
@@ -4980,7 +4983,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 4984 "BatchImport.c"
+#line 4987 "BatchImport.c"
 	}
 }
 
@@ -4990,11 +4993,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 4994 "BatchImport.c"
+#line 4997 "BatchImport.c"
 	} else {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4998 "BatchImport.c"
+#line 5001 "BatchImport.c"
 	}
 }
 
@@ -5002,37 +5005,37 @@ 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 5006 "BatchImport.c"
+#line 5009 "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 5013 "BatchImport.c"
+#line 5016 "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 5020 "BatchImport.c"
+#line 5023 "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 5024 "BatchImport.c"
+#line 5027 "BatchImport.c"
 		}
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = import_manifest_ref (object);
-#line 5028 "BatchImport.c"
+#line 5031 "BatchImport.c"
 	} else {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5032 "BatchImport.c"
+#line 5035 "BatchImport.c"
 	}
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 5036 "BatchImport.c"
+#line 5039 "BatchImport.c"
 }
 
 
@@ -5043,25 +5046,25 @@ static gchar* value_import_manifest_lcopy_value (const GValue* value, guint n_co
 	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 5047 "BatchImport.c"
+#line 5050 "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 5053 "BatchImport.c"
+#line 5056 "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 5057 "BatchImport.c"
+#line 5060 "BatchImport.c"
 	} else {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = import_manifest_ref (value->data[0].v_pointer);
-#line 5061 "BatchImport.c"
+#line 5064 "BatchImport.c"
 	}
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 5065 "BatchImport.c"
+#line 5068 "BatchImport.c"
 }
 
 
@@ -5075,7 +5078,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 5079 "BatchImport.c"
+#line 5082 "BatchImport.c"
 }
 
 
@@ -5084,7 +5087,7 @@ 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 5088 "BatchImport.c"
+#line 5091 "BatchImport.c"
 }
 
 
@@ -5104,17 +5107,17 @@ 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 5108 "BatchImport.c"
+#line 5111 "BatchImport.c"
 	} else {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5112 "BatchImport.c"
+#line 5115 "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 5118 "BatchImport.c"
+#line 5121 "BatchImport.c"
 	}
 }
 
@@ -5133,17 +5136,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 5137 "BatchImport.c"
+#line 5140 "BatchImport.c"
 	} else {
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5141 "BatchImport.c"
+#line 5144 "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 5147 "BatchImport.c"
+#line 5150 "BatchImport.c"
 	}
 }
 
@@ -5153,7 +5156,7 @@ 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 5157 "BatchImport.c"
+#line 5160 "BatchImport.c"
 }
 
 
@@ -5170,52 +5173,52 @@ static void import_manifest_instance_init (ImportManifest * self) {
 	GeeArrayList* _tmp9_ = NULL;
 	GeeArrayList* _tmp10_ = NULL;
 #line 309 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
 	self->imported = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
 #line 310 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+	_tmp1_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
 #line 310 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->success = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_LIST, GeeList);
 #line 311 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+	_tmp2_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
 #line 311 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->camera_failed = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList);
 #line 312 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+	_tmp3_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
 #line 312 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->failed = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_LIST, GeeList);
 #line 313 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+	_tmp4_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
 #line 313 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->write_failed = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList);
 #line 314 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+	_tmp5_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
 #line 314 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->skipped_photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_LIST, GeeList);
 #line 315 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp6_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+	_tmp6_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
 #line 315 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->skipped_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList);
 #line 316 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp7_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+	_tmp7_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
 #line 316 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->aborted = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_LIST, GeeList);
 #line 317 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp8_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+	_tmp8_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
 #line 317 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->already_imported = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_LIST, GeeList);
 #line 318 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp9_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+	_tmp9_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
 #line 318 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->corrupt_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_LIST, GeeList);
 #line 319 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp10_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+	_tmp10_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
 #line 319 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	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 5219 "BatchImport.c"
+#line 5222 "BatchImport.c"
 }
 
 
@@ -5247,7 +5250,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 5251 "BatchImport.c"
+#line 5254 "BatchImport.c"
 }
 
 
@@ -5272,7 +5275,7 @@ gpointer import_manifest_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 5276 "BatchImport.c"
+#line 5279 "BatchImport.c"
 }
 
 
@@ -5285,7 +5288,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 5289 "BatchImport.c"
+#line 5292 "BatchImport.c"
 	}
 }
 
@@ -5293,14 +5296,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 5297 "BatchImport.c"
+#line 5300 "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 5304 "BatchImport.c"
+#line 5307 "BatchImport.c"
 }
 
 
@@ -5309,7 +5312,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 5313 "BatchImport.c"
+#line 5316 "BatchImport.c"
 }
 
 
@@ -5318,7 +5321,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 5322 "BatchImport.c"
+#line 5325 "BatchImport.c"
 }
 
 
@@ -5327,7 +5330,7 @@ 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 5331 "BatchImport.c"
+#line 5334 "BatchImport.c"
 }
 
 
@@ -5405,7 +5408,7 @@ 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 5409 "BatchImport.c"
+#line 5412 "BatchImport.c"
 		GCancellable* _tmp10_ = NULL;
 		GCancellable* _tmp11_ = NULL;
 #line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5416,7 +5419,7 @@ 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 5420 "BatchImport.c"
+#line 5423 "BatchImport.c"
 	} else {
 		GCancellable* _tmp12_ = NULL;
 #line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5425,7 +5428,7 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
 		_g_object_unref0 (_tmp8_);
 #line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = _tmp12_;
-#line 5429 "BatchImport.c"
+#line 5432 "BatchImport.c"
 	}
 #line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp13_ = _g_object_ref0 (_tmp8_);
@@ -5437,7 +5440,7 @@ 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 5441 "BatchImport.c"
+#line 5444 "BatchImport.c"
 		BatchImportRoll* _tmp16_ = NULL;
 		BatchImportRoll* _tmp17_ = NULL;
 #line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5448,7 +5451,7 @@ 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 5452 "BatchImport.c"
+#line 5455 "BatchImport.c"
 	} else {
 		BatchImportRoll* _tmp18_ = NULL;
 #line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5457,7 +5460,7 @@ 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_ = _tmp18_;
-#line 5461 "BatchImport.c"
+#line 5464 "BatchImport.c"
 	}
 #line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp19_ = _batch_import_roll_ref0 (_tmp14_);
@@ -5469,15 +5472,15 @@ 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 5473 "BatchImport.c"
+#line 5476 "BatchImport.c"
 		GeeHashSet* _tmp21_ = NULL;
 #line 491 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp21_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+		_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 5481 "BatchImport.c"
+#line 5484 "BatchImport.c"
 		{
 			GeeList* _source_list = NULL;
 			ImportManifest* _tmp22_ = NULL;
@@ -5508,7 +5511,7 @@ 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 5512 "BatchImport.c"
+#line 5515 "BatchImport.c"
 				gint _tmp28_ = 0;
 				gint _tmp29_ = 0;
 				gint _tmp30_ = 0;
@@ -5532,7 +5535,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 5536 "BatchImport.c"
+#line 5539 "BatchImport.c"
 				}
 #line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp31_ = _source_list;
@@ -5556,11 +5559,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 5560 "BatchImport.c"
+#line 5563 "BatchImport.c"
 			}
 #line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_source_list);
-#line 5564 "BatchImport.c"
+#line 5567 "BatchImport.c"
 		}
 	}
 #line 498 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5579,14 +5582,14 @@ 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 5583 "BatchImport.c"
+#line 5586 "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 5590 "BatchImport.c"
+#line 5593 "BatchImport.c"
 }
 
 
@@ -5604,7 +5607,7 @@ gchar* batch_import_get_name (BatchImport* self) {
 	result = _tmp1_;
 #line 512 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5608 "BatchImport.c"
+#line 5611 "BatchImport.c"
 }
 
 
@@ -5616,7 +5619,7 @@ void batch_import_user_halt (BatchImport* self) {
 	_tmp0_ = self->priv->cancellable;
 #line 516 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_cancellable_cancel (_tmp0_);
-#line 5620 "BatchImport.c"
+#line 5623 "BatchImport.c"
 }
 
 
@@ -5631,7 +5634,7 @@ gboolean batch_import_get_untrash_duplicates (BatchImport* self) {
 	result = _tmp0_;
 #line 520 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5635 "BatchImport.c"
+#line 5638 "BatchImport.c"
 }
 
 
@@ -5643,7 +5646,7 @@ void batch_import_set_untrash_duplicates (BatchImport* self, gboolean untrash_du
 	_tmp0_ = untrash_duplicates;
 #line 524 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->untrash_duplicates = _tmp0_;
-#line 5647 "BatchImport.c"
+#line 5650 "BatchImport.c"
 }
 
 
@@ -5658,7 +5661,7 @@ gboolean batch_import_get_mark_duplicates_online (BatchImport* self) {
 	result = _tmp0_;
 #line 528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5662 "BatchImport.c"
+#line 5665 "BatchImport.c"
 }
 
 
@@ -5670,7 +5673,7 @@ void batch_import_set_mark_duplicates_online (BatchImport* self, gboolean mark_d
 	_tmp0_ = mark_duplicates_online;
 #line 532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->mark_duplicates_online = _tmp0_;
-#line 5674 "BatchImport.c"
+#line 5677 "BatchImport.c"
 }
 
 
@@ -5679,7 +5682,7 @@ 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 5683 "BatchImport.c"
+#line 5686 "BatchImport.c"
 }
 
 
@@ -5690,10 +5693,10 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
 	BatchImportResult* _tmp1_ = NULL;
 	BatchImportResult* _tmp2_ = NULL;
 	ImportResult _tmp3_ = 0;
-	gboolean _tmp22_ = FALSE;
-	BatchImportResult* _tmp23_ = NULL;
-	ImportResult _tmp24_ = 0;
-	gboolean _tmp25_ = FALSE;
+	gboolean _tmp23_ = FALSE;
+	BatchImportResult* _tmp24_ = NULL;
+	ImportResult _tmp25_ = 0;
+	gboolean _tmp26_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 545 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE);
@@ -5713,7 +5716,7 @@ 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 5717 "BatchImport.c"
+#line 5720 "BatchImport.c"
 		BatchImportResult* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		BatchImportResult* _tmp6_ = NULL;
@@ -5728,7 +5731,7 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
 		_tmp7_ = _tmp6_->file;
 #line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp7_ != NULL) {
-#line 5732 "BatchImport.c"
+#line 5735 "BatchImport.c"
 			BatchImportResult* _tmp8_ = NULL;
 			ImportResult _tmp9_ = 0;
 			gboolean _tmp10_ = FALSE;
@@ -5740,20 +5743,20 @@ 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 5744 "BatchImport.c"
+#line 5747 "BatchImport.c"
 		} else {
 #line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp5_ = FALSE;
-#line 5748 "BatchImport.c"
+#line 5751 "BatchImport.c"
 		}
 #line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp5_) {
-#line 5752 "BatchImport.c"
+#line 5755 "BatchImport.c"
 			guint64 filesize = 0ULL;
-			guint64 _tmp21_ = 0ULL;
+			guint64 _tmp22_ = 0ULL;
 #line 554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			filesize = (guint64) 0;
-#line 5757 "BatchImport.c"
+#line 5760 "BatchImport.c"
 			{
 				guint64 _tmp11_ = 0ULL;
 				BatchImportResult* _tmp12_ = NULL;
@@ -5769,12 +5772,12 @@ 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 5773 "BatchImport.c"
+#line 5776 "BatchImport.c"
 					goto __catch410_g_error;
 				}
 #line 557 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				filesize = _tmp11_;
-#line 5778 "BatchImport.c"
+#line 5781 "BatchImport.c"
 			}
 			goto __finally410;
 			__catch410_g_error:
@@ -5808,72 +5811,74 @@ 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 5812 "BatchImport.c"
+#line 5815 "BatchImport.c"
 			}
 			__finally410:
 #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 5820 "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);
 #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_clear_error (&_inner_error_);
 #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				return FALSE;
-#line 5823 "BatchImport.c"
+				return _tmp21_;
+#line 5828 "BatchImport.c"
 			}
 #line 563 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp21_ = filesize;
+			_tmp22_ = filesize;
 #line 563 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			batch_import_report_progress (self, _tmp21_);
-#line 5829 "BatchImport.c"
+			batch_import_report_progress (self, _tmp22_);
+#line 5834 "BatchImport.c"
 		}
 	}
 #line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp23_ = import_result;
+	_tmp24_ = import_result;
 #line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp24_ = _tmp23_->result;
+	_tmp25_ = _tmp24_->result;
 #line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp25_ = import_result_is_nonuser_abort (_tmp24_);
+	_tmp26_ = import_result_is_nonuser_abort (_tmp25_);
 #line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp25_) {
-#line 5840 "BatchImport.c"
-		gboolean _tmp26_ = FALSE;
+	if (_tmp26_) {
+#line 5845 "BatchImport.c"
+		gboolean _tmp27_ = FALSE;
 #line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp26_ = proceed;
+		_tmp27_ = proceed;
 #line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp22_ = _tmp26_;
-#line 5846 "BatchImport.c"
+		_tmp23_ = _tmp27_;
+#line 5851 "BatchImport.c"
 	} else {
 #line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp22_ = FALSE;
-#line 5850 "BatchImport.c"
+		_tmp23_ = FALSE;
+#line 5855 "BatchImport.c"
 	}
 #line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp22_) {
-#line 5854 "BatchImport.c"
-		BatchImportResult* _tmp27_ = NULL;
-		ImportResult _tmp28_ = 0;
-		BatchImportResult* _tmp29_ = NULL;
-		const gchar* _tmp30_ = NULL;
+	if (_tmp23_) {
+#line 5859 "BatchImport.c"
+		BatchImportResult* _tmp28_ = NULL;
+		ImportResult _tmp29_ = 0;
+		BatchImportResult* _tmp30_ = NULL;
+		const gchar* _tmp31_ = NULL;
 #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp27_ = import_result;
+		_tmp28_ = import_result;
 #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp28_ = _tmp27_->result;
+		_tmp29_ = _tmp28_->result;
 #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp29_ = import_result;
+		_tmp30_ = import_result;
 #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp30_ = _tmp29_->errmsg;
+		_tmp31_ = _tmp30_->errmsg;
 #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_signal_emit_by_name (self, "fatal-error", _tmp28_, _tmp30_);
+		g_signal_emit_by_name (self, "fatal-error", _tmp29_, _tmp31_);
 #line 570 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		proceed = FALSE;
-#line 5871 "BatchImport.c"
+#line 5876 "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 5877 "BatchImport.c"
+#line 5882 "BatchImport.c"
 }
 
 
@@ -5893,7 +5898,7 @@ 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 5897 "BatchImport.c"
+#line 5902 "BatchImport.c"
 		gulong now = 0UL;
 		gulong _tmp3_ = 0UL;
 		gulong _tmp4_ = 0UL;
@@ -5908,7 +5913,7 @@ 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 5912 "BatchImport.c"
+#line 5917 "BatchImport.c"
 			gulong _tmp6_ = 0UL;
 #line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp6_ = now;
@@ -5916,7 +5921,7 @@ static void batch_import_report_progress (BatchImport* self, guint64 increment_o
 			self->priv->last_preparing_ms = _tmp6_;
 #line 585 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_signal_emit_by_name (self, "preparing");
-#line 5920 "BatchImport.c"
+#line 5925 "BatchImport.c"
 		}
 	} else {
 		guint64 _tmp7_ = 0ULL;
@@ -5924,7 +5929,7 @@ static void batch_import_report_progress (BatchImport* self, guint64 increment_o
 		_tmp7_ = increment_of_progress;
 #line 587 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp7_ > ((guint64) 0)) {
-#line 5928 "BatchImport.c"
+#line 5933 "BatchImport.c"
 			gulong now = 0UL;
 			gulong _tmp8_ = 0UL;
 			gulong _tmp9_ = 0UL;
@@ -5939,7 +5944,7 @@ 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 5943 "BatchImport.c"
+#line 5948 "BatchImport.c"
 				gulong _tmp11_ = 0UL;
 				guint64 _tmp12_ = 0ULL;
 				guint64 _tmp13_ = 0ULL;
@@ -5953,7 +5958,7 @@ static void batch_import_report_progress (BatchImport* self, guint64 increment_o
 				_tmp13_ = self->priv->total_bytes;
 #line 591 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_signal_emit_by_name (self, "progress", _tmp12_, _tmp13_);
-#line 5957 "BatchImport.c"
+#line 5962 "BatchImport.c"
 			}
 		}
 	}
@@ -5969,7 +5974,7 @@ 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 5973 "BatchImport.c"
+#line 5978 "BatchImport.c"
 	{
 		GeeList* _import_result_list = NULL;
 		BackgroundImportJob* _tmp0_ = NULL;
@@ -6000,7 +6005,7 @@ 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 6004 "BatchImport.c"
+#line 6009 "BatchImport.c"
 			gint _tmp6_ = 0;
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
@@ -6022,7 +6027,7 @@ static gboolean batch_import_report_failures (BatchImport* self, BackgroundImpor
 			if (!(_tmp7_ < _tmp8_)) {
 #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 6026 "BatchImport.c"
+#line 6031 "BatchImport.c"
 			}
 #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp9_ = _import_result_list;
@@ -6040,21 +6045,21 @@ static gboolean batch_import_report_failures (BatchImport* self, BackgroundImpor
 			if (!_tmp13_) {
 #line 601 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				proceed = FALSE;
-#line 6044 "BatchImport.c"
+#line 6049 "BatchImport.c"
 			}
 #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_batch_import_result_unref0 (import_result);
-#line 6048 "BatchImport.c"
+#line 6053 "BatchImport.c"
 		}
 #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_import_result_list);
-#line 6052 "BatchImport.c"
+#line 6057 "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 6058 "BatchImport.c"
+#line 6063 "BatchImport.c"
 }
 
 
@@ -6075,14 +6080,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 6079 "BatchImport.c"
+#line 6084 "BatchImport.c"
 		const gchar* _tmp1_ = NULL;
 #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 6085 "BatchImport.c"
+#line 6090 "BatchImport.c"
 	}
 #line 611 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->completed = TRUE;
@@ -6104,7 +6109,7 @@ 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 6107 "BatchImport.c"
+#line 6112 "BatchImport.c"
 		BatchImportImportReporter _tmp6_ = NULL;
 		void* _tmp6__target = NULL;
 		ImportManifest* _tmp7_ = NULL;
@@ -6119,7 +6124,7 @@ 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 6122 "BatchImport.c"
+#line 6127 "BatchImport.c"
 	}
 #line 621 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = self->priv->manifest;
@@ -6127,7 +6132,7 @@ static void batch_import_report_completed (BatchImport* self, const gchar* where
 	_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 6130 "BatchImport.c"
+#line 6135 "BatchImport.c"
 }
 
 
@@ -6146,7 +6151,7 @@ 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 6149 "BatchImport.c"
+#line 6154 "BatchImport.c"
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
 #line 629 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6155,13 +6160,13 @@ static void batch_import_file_import_complete (BatchImport* self) {
 		_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 6158 "BatchImport.c"
+#line 6163 "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 6164 "BatchImport.c"
+#line 6169 "BatchImport.c"
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
 #line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6170,17 +6175,17 @@ static void batch_import_file_import_complete (BatchImport* self) {
 		_tmp7_ = self->priv->file_imports_to_perform;
 #line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = _tmp6_ == _tmp7_;
-#line 6173 "BatchImport.c"
+#line 6178 "BatchImport.c"
 	} else {
 #line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = FALSE;
-#line 6177 "BatchImport.c"
+#line 6182 "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 6183 "BatchImport.c"
+#line 6188 "BatchImport.c"
 	}
 }
 
@@ -6188,14 +6193,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 6191 "BatchImport.c"
+#line 6196 "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 6198 "BatchImport.c"
+#line 6203 "BatchImport.c"
 }
 
 
@@ -6204,7 +6209,7 @@ 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 6207 "BatchImport.c"
+#line 6212 "BatchImport.c"
 }
 
 
@@ -6247,7 +6252,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 6250 "BatchImport.c"
+#line 6255 "BatchImport.c"
 }
 
 
@@ -6261,35 +6266,35 @@ static gboolean batch_import_on_sniffer_working (BatchImport* self) {
 	result = TRUE;
 #line 656 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 6264 "BatchImport.c"
+#line 6269 "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 6271 "BatchImport.c"
+#line 6276 "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 6278 "BatchImport.c"
+#line 6283 "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 6285 "BatchImport.c"
+#line 6290 "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 6292 "BatchImport.c"
+#line 6297 "BatchImport.c"
 }
 
 
@@ -6335,7 +6340,7 @@ 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 6338 "BatchImport.c"
+#line 6343 "BatchImport.c"
 	} else {
 		WorkSniffer* _tmp6_ = NULL;
 		GeeList* _tmp7_ = NULL;
@@ -6351,7 +6356,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 6354 "BatchImport.c"
+#line 6359 "BatchImport.c"
 	}
 #line 666 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp3_) {
@@ -6361,7 +6366,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 6364 "BatchImport.c"
+#line 6369 "BatchImport.c"
 	}
 #line 672 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = sniffer;
@@ -6389,7 +6394,7 @@ 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 6392 "BatchImport.c"
+#line 6397 "BatchImport.c"
 		guint _tmp19_ = 0U;
 #line 685 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp19_ = self->priv->throbber_id;
@@ -6397,13 +6402,13 @@ static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob*
 		g_source_remove (_tmp19_);
 #line 686 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->priv->throbber_id = (guint) 0;
-#line 6400 "BatchImport.c"
+#line 6405 "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 6406 "BatchImport.c"
+#line 6411 "BatchImport.c"
 }
 
 
@@ -6440,7 +6445,7 @@ 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 6443 "BatchImport.c"
+#line 6448 "BatchImport.c"
 		guint _tmp5_ = 0U;
 #line 701 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = self->priv->throbber_id;
@@ -6448,39 +6453,39 @@ static void batch_import_on_sniffer_cancelled (BatchImport* self, BackgroundJob*
 		g_source_remove (_tmp5_);
 #line 702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->priv->throbber_id = (guint) 0;
-#line 6451 "BatchImport.c"
+#line 6456 "BatchImport.c"
 	}
 #line 690 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (sniffer);
-#line 6455 "BatchImport.c"
+#line 6460 "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 6462 "BatchImport.c"
+#line 6467 "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 6469 "BatchImport.c"
+#line 6474 "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 6476 "BatchImport.c"
+#line 6481 "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 6483 "BatchImport.c"
+#line 6488 "BatchImport.c"
 }
 
 
@@ -6489,7 +6494,7 @@ 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 6492 "BatchImport.c"
+#line 6497 "BatchImport.c"
 		gboolean _tmp0_ = FALSE;
 		GeeList* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
@@ -6509,7 +6514,7 @@ static void batch_import_flush_import_jobs (BatchImport* self) {
 		_tmp3_ = _tmp2_;
 #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp3_ > 0) {
-#line 6512 "BatchImport.c"
+#line 6517 "BatchImport.c"
 			Workers* _tmp4_ = NULL;
 			gint _tmp5_ = 0;
 			guint _tmp6_ = 0U;
@@ -6521,17 +6526,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 6524 "BatchImport.c"
+#line 6529 "BatchImport.c"
 		} else {
 #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp0_ = FALSE;
-#line 6528 "BatchImport.c"
+#line 6533 "BatchImport.c"
 		}
 #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!_tmp0_) {
 #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 6534 "BatchImport.c"
+#line 6539 "BatchImport.c"
 		}
 #line 716 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = batch_import_import_workers;
@@ -6553,11 +6558,11 @@ 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 6556 "BatchImport.c"
+#line 6561 "BatchImport.c"
 	}
 #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	while (TRUE) {
-#line 6560 "BatchImport.c"
+#line 6565 "BatchImport.c"
 		gboolean _tmp14_ = FALSE;
 		GeeList* _tmp15_ = NULL;
 		gint _tmp16_ = 0;
@@ -6579,7 +6584,7 @@ static void batch_import_flush_import_jobs (BatchImport* self) {
 		_tmp17_ = _tmp16_;
 #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp17_ > 0) {
-#line 6582 "BatchImport.c"
+#line 6587 "BatchImport.c"
 			Workers* _tmp18_ = NULL;
 			gint _tmp19_ = 0;
 			guint _tmp20_ = 0U;
@@ -6591,17 +6596,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 6594 "BatchImport.c"
+#line 6599 "BatchImport.c"
 		} else {
 #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp14_ = FALSE;
-#line 6598 "BatchImport.c"
+#line 6603 "BatchImport.c"
 		}
 #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!_tmp14_) {
 #line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 6604 "BatchImport.c"
+#line 6609 "BatchImport.c"
 		}
 #line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp21_ = batch_import_import_workers;
@@ -6627,7 +6632,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 6630 "BatchImport.c"
+#line 6635 "BatchImport.c"
 	}
 }
 
@@ -6649,7 +6654,7 @@ 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 6652 "BatchImport.c"
+#line 6657 "BatchImport.c"
 		GeeHashMap* _tmp3_ = NULL;
 		PreparedFile* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
@@ -6664,15 +6669,15 @@ 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 6667 "BatchImport.c"
+#line 6672 "BatchImport.c"
 	} else {
 #line 731 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = FALSE;
-#line 6671 "BatchImport.c"
+#line 6676 "BatchImport.c"
 	}
 #line 731 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_) {
-#line 6675 "BatchImport.c"
+#line 6680 "BatchImport.c"
 		GeeHashMap* _tmp7_ = NULL;
 		PreparedFile* _tmp8_ = NULL;
 		const gchar* _tmp9_ = NULL;
@@ -6689,7 +6694,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 6692 "BatchImport.c"
+#line 6697 "BatchImport.c"
 	}
 #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp11_ = prepared_file;
@@ -6697,7 +6702,7 @@ 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 6700 "BatchImport.c"
+#line 6705 "BatchImport.c"
 		GeeHashMap* _tmp13_ = NULL;
 		PreparedFile* _tmp14_ = NULL;
 		const gchar* _tmp15_ = NULL;
@@ -6715,20 +6720,20 @@ 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 6718 "BatchImport.c"
+#line 6723 "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 6724 "BatchImport.c"
+#line 6729 "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 6731 "BatchImport.c"
+#line 6736 "BatchImport.c"
 }
 
 
@@ -6762,7 +6767,7 @@ static void batch_import_on_file_prepared (BatchImport* self, BackgroundJob* j,
 #line 750 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = cluster->list;
 #line 750 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 750 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = _tmp4_;
 #line 750 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6779,7 +6784,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 6782 "BatchImport.c"
+#line 6787 "BatchImport.c"
 }
 
 
@@ -6792,7 +6797,7 @@ 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 6795 "BatchImport.c"
+#line 6800 "BatchImport.c"
 }
 
 
@@ -6821,7 +6826,7 @@ 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 6824 "BatchImport.c"
+#line 6829 "BatchImport.c"
 }
 
 
@@ -6829,7 +6834,7 @@ static void batch_import_process_prepared_files_finish (BatchImport* self, GAsyn
 	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 6832 "BatchImport.c"
+#line 6837 "BatchImport.c"
 }
 
 
@@ -6838,7 +6843,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 6841 "BatchImport.c"
+#line 6846 "BatchImport.c"
 }
 
 
@@ -6847,16 +6852,16 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 	switch (_data_->_state_) {
 #line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case 0:
-#line 6850 "BatchImport.c"
+#line 6855 "BatchImport.c"
 		goto _state_0;
 #line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case 1:
-#line 6854 "BatchImport.c"
+#line 6859 "BatchImport.c"
 		goto _state_1;
 		default:
 #line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_assert_not_reached ();
-#line 6859 "BatchImport.c"
+#line 6864 "BatchImport.c"
 	}
 	_state_0:
 	{
@@ -6906,7 +6911,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 			if (!(_data_->_tmp6_ < _data_->_tmp7_)) {
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 6909 "BatchImport.c"
+#line 6914 "BatchImport.c"
 			}
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp8_ = NULL;
@@ -6928,7 +6933,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 			_data_->_state_ = 1;
 #line 760 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return FALSE;
-#line 6931 "BatchImport.c"
+#line 6936 "BatchImport.c"
 			_state_1:
 			;
 #line 762 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6975,7 +6980,7 @@ 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 6978 "BatchImport.c"
+#line 6983 "BatchImport.c"
 					{
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp18_ = NULL;
@@ -7073,19 +7078,19 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 							_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 7076 "BatchImport.c"
+#line 7081 "BatchImport.c"
 						}
 #line 782 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						break;
-#line 7080 "BatchImport.c"
+#line 7085 "BatchImport.c"
 					}
 #line 770 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH:
-#line 7084 "BatchImport.c"
+#line 7089 "BatchImport.c"
 					{
 #line 786 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						break;
-#line 7088 "BatchImport.c"
+#line 7093 "BatchImport.c"
 					}
 					default:
 					{
@@ -7099,7 +7104,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 						_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 7102 "BatchImport.c"
+#line 7107 "BatchImport.c"
 					}
 				}
 			}
@@ -7125,7 +7130,7 @@ 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 7128 "BatchImport.c"
+#line 7133 "BatchImport.c"
 			}
 #line 801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp42_ = NULL;
@@ -7165,7 +7170,7 @@ 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 7168 "BatchImport.c"
+#line 7173 "BatchImport.c"
 					{
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp49_ = NULL;
@@ -7263,19 +7268,19 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 							_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 7266 "BatchImport.c"
+#line 7271 "BatchImport.c"
 						}
 #line 813 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						break;
-#line 7270 "BatchImport.c"
+#line 7275 "BatchImport.c"
 					}
 #line 803 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					case VIDEO_SOURCE_COLLECTION_STATE_TRASH:
-#line 7274 "BatchImport.c"
+#line 7279 "BatchImport.c"
 					{
 #line 817 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						break;
-#line 7278 "BatchImport.c"
+#line 7283 "BatchImport.c"
 					}
 					default:
 					{
@@ -7289,7 +7294,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 						_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 7292 "BatchImport.c"
+#line 7297 "BatchImport.c"
 					}
 				}
 			}
@@ -7317,7 +7322,7 @@ 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 7320 "BatchImport.c"
+#line 7325 "BatchImport.c"
 			}
 #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp74_ = NULL;
@@ -7351,11 +7356,11 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 				_data_->_tmp80_ = video_is_duplicate (_data_->_tmp77_, _data_->_tmp79_);
 #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp73_ = _data_->_tmp80_;
-#line 7354 "BatchImport.c"
+#line 7359 "BatchImport.c"
 			} else {
 #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp73_ = FALSE;
-#line 7358 "BatchImport.c"
+#line 7363 "BatchImport.c"
 			}
 #line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_data_->_tmp73_) {
@@ -7513,7 +7518,7 @@ 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 7516 "BatchImport.c"
+#line 7521 "BatchImport.c"
 					}
 #line 849 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp109_ = NULL;
@@ -7594,11 +7599,11 @@ 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 7596 "BatchImport.c"
+#line 7601 "BatchImport.c"
 					}
 #line 843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (_data_->dupe_video);
-#line 7600 "BatchImport.c"
+#line 7605 "BatchImport.c"
 				}
 #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp123_ = NULL;
@@ -7698,13 +7703,13 @@ 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 7700 "BatchImport.c"
+#line 7705 "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 7706 "BatchImport.c"
+#line 7711 "BatchImport.c"
 			}
 #line 877 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp141_ = NULL;
@@ -7810,7 +7815,7 @@ 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 7812 "BatchImport.c"
+#line 7817 "BatchImport.c"
 			} else {
 #line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp163_ = NULL;
@@ -7884,11 +7889,11 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 							_data_->_tmp178_ = _data_->_tmp177_->full_md5;
 #line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp175_ = _data_->_tmp178_ != NULL;
-#line 7886 "BatchImport.c"
+#line 7891 "BatchImport.c"
 						} else {
 #line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp175_ = FALSE;
-#line 7890 "BatchImport.c"
+#line 7895 "BatchImport.c"
 						}
 #line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_data_->_tmp175_) {
@@ -7912,7 +7917,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 							_g_object_unref0 (_data_->photo);
 #line 892 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->photo = _data_->_tmp182_;
-#line 7914 "BatchImport.c"
+#line 7919 "BatchImport.c"
 						}
 #line 894 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp183_ = NULL;
@@ -7967,7 +7972,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 							_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 7968 "BatchImport.c"
+#line 7973 "BatchImport.c"
 						}
 					}
 #line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -7982,11 +7987,11 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 						_data_->_tmp195_ = _data_->self->priv->mark_duplicates_online;
 #line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp193_ = _data_->_tmp195_;
-#line 7983 "BatchImport.c"
+#line 7988 "BatchImport.c"
 					} else {
 #line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp193_ = FALSE;
-#line 7987 "BatchImport.c"
+#line 7992 "BatchImport.c"
 					}
 #line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (_data_->_tmp193_) {
@@ -8026,11 +8031,11 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 							_data_->_tmp203_ = _data_->_tmp202_->full_md5;
 #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp200_ = _data_->_tmp203_ != NULL;
-#line 8027 "BatchImport.c"
+#line 8032 "BatchImport.c"
 						} else {
 #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp200_ = FALSE;
-#line 8031 "BatchImport.c"
+#line 8036 "BatchImport.c"
 						}
 #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_data_->_tmp200_) {
@@ -8054,7 +8059,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 							_g_object_unref0 (_data_->photo);
 #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->photo = _data_->_tmp207_;
-#line 8055 "BatchImport.c"
+#line 8060 "BatchImport.c"
 						}
 #line 911 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp208_ = NULL;
@@ -8103,7 +8108,7 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 							_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 8103 "BatchImport.c"
+#line 8108 "BatchImport.c"
 						}
 					}
 #line 920 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8218,7 +8223,7 @@ 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 8218 "BatchImport.c"
+#line 8223 "BatchImport.c"
 					}
 #line 934 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp238_ = NULL;
@@ -8394,7 +8399,7 @@ 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 8394 "BatchImport.c"
+#line 8399 "BatchImport.c"
 				}
 			}
 #line 948 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8421,7 +8426,7 @@ 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 8421 "BatchImport.c"
+#line 8426 "BatchImport.c"
 			}
 #line 955 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			batch_import_report_progress (_data_->self, (guint64) 0);
@@ -8443,11 +8448,11 @@ 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 8443 "BatchImport.c"
+#line 8448 "BatchImport.c"
 		}
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_data_->_prepared_file_list);
-#line 8447 "BatchImport.c"
+#line 8452 "BatchImport.c"
 	}
 #line 959 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_flush_import_jobs (_data_->self);
@@ -8455,17 +8460,17 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 	if (_data_->_state_ == 0) {
 #line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 8455 "BatchImport.c"
+#line 8460 "BatchImport.c"
 	} else {
 #line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_simple_async_result_complete (_data_->_async_result);
-#line 8459 "BatchImport.c"
+#line 8464 "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 8465 "BatchImport.c"
+#line 8470 "BatchImport.c"
 }
 
 
@@ -8524,23 +8529,23 @@ 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 8524 "BatchImport.c"
+#line 8529 "BatchImport.c"
 		gboolean _tmp11_ = FALSE;
 #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 8530 "BatchImport.c"
+#line 8535 "BatchImport.c"
 	} else {
 #line 980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = FALSE;
-#line 8534 "BatchImport.c"
+#line 8539 "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 8540 "BatchImport.c"
+#line 8545 "BatchImport.c"
 	} else {
 		gboolean _tmp12_ = FALSE;
 		gint _tmp13_ = 0;
@@ -8551,28 +8556,28 @@ static void batch_import_done_preparing_files (BatchImport* self, BackgroundJob*
 		_tmp14_ = self->priv->file_imports_to_perform;
 #line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp13_ == _tmp14_) {
-#line 8551 "BatchImport.c"
+#line 8556 "BatchImport.c"
 			gboolean _tmp15_ = FALSE;
 #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 8557 "BatchImport.c"
+#line 8562 "BatchImport.c"
 		} else {
 #line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp12_ = FALSE;
-#line 8561 "BatchImport.c"
+#line 8566 "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 8567 "BatchImport.c"
+#line 8572 "BatchImport.c"
 		}
 	}
 #line 962 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (prepare_files_job);
-#line 8572 "BatchImport.c"
+#line 8577 "BatchImport.c"
 }
 
 
@@ -8586,7 +8591,7 @@ 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 8586 "BatchImport.c"
+#line 8591 "BatchImport.c"
 }
 
 
@@ -8600,7 +8605,7 @@ 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 8600 "BatchImport.c"
+#line 8605 "BatchImport.c"
 }
 
 
@@ -8644,7 +8649,7 @@ 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 8644 "BatchImport.c"
+#line 8649 "BatchImport.c"
 		PreparedFileImportJob* _tmp7_ = NULL;
 		BatchImportResult* _tmp8_ = NULL;
 		ImportResult _tmp9_ = 0;
@@ -8666,7 +8671,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 8666 "BatchImport.c"
+#line 8671 "BatchImport.c"
 	}
 #line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp12_ = job;
@@ -8674,7 +8679,7 @@ 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 8674 "BatchImport.c"
+#line 8679 "BatchImport.c"
 		PreparedFileImportJob* _tmp14_ = NULL;
 		ReadyForImport* _tmp15_ = NULL;
 		BatchImportResult* _tmp16_ = NULL;
@@ -8720,7 +8725,7 @@ 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 8720 "BatchImport.c"
+#line 8725 "BatchImport.c"
 			TombstoneSourceCollection* _tmp24_ = NULL;
 			Tombstone* _tmp25_ = NULL;
 #line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8729,7 +8734,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 			_tmp25_ = tombstone;
 #line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			tombstone_source_collection_resurrect (_tmp24_, _tmp25_);
-#line 8729 "BatchImport.c"
+#line 8734 "BatchImport.c"
 		}
 #line 1026 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		source = NULL;
@@ -8741,7 +8746,7 @@ 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 8741 "BatchImport.c"
+#line 8746 "BatchImport.c"
 			PreparedFileImportJob* _tmp29_ = NULL;
 			ReadyForImport* _tmp30_ = NULL;
 			BatchImportResult* _tmp31_ = NULL;
@@ -8770,7 +8775,7 @@ 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 8770 "BatchImport.c"
+#line 8775 "BatchImport.c"
 		} else {
 			PreparedFileImportJob* _tmp37_ = NULL;
 			ReadyForImport* _tmp38_ = NULL;
@@ -8825,7 +8830,7 @@ 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 8825 "BatchImport.c"
+#line 8830 "BatchImport.c"
 				BackingPhotoRow* bpr = NULL;
 				BackingPhotoRow* _tmp51_ = NULL;
 				BackingPhotoRow* _tmp52_ = NULL;
@@ -8886,7 +8891,7 @@ 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 8886 "BatchImport.c"
+#line 8891 "BatchImport.c"
 				{
 					MediaSource* _tmp66_ = NULL;
 					BackingPhotoRow* _tmp67_ = NULL;
@@ -8898,7 +8903,7 @@ 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 8898 "BatchImport.c"
+#line 8903 "BatchImport.c"
 						goto __catch411_g_error;
 					}
 				}
@@ -8927,7 +8932,7 @@ 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 8926 "BatchImport.c"
+#line 8931 "BatchImport.c"
 				}
 				__finally411:
 #line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8948,11 +8953,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 8947 "BatchImport.c"
+#line 8952 "BatchImport.c"
 				}
 #line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_backing_photo_row_unref0 (bpr);
-#line 8951 "BatchImport.c"
+#line 8956 "BatchImport.c"
 			}
 #line 1051 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp72_ = photo;
@@ -8960,7 +8965,7 @@ 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 8959 "BatchImport.c"
+#line 8964 "BatchImport.c"
 				RawDeveloper d = 0;
 				ConfigFacade* _tmp74_ = NULL;
 				ConfigFacade* _tmp75_ = NULL;
@@ -8988,7 +8993,7 @@ 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 8987 "BatchImport.c"
+#line 8992 "BatchImport.c"
 					Photo* _tmp80_ = NULL;
 					RawDeveloper _tmp81_ = 0;
 					gboolean _tmp82_ = FALSE;
@@ -9000,17 +9005,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 8999 "BatchImport.c"
+#line 9004 "BatchImport.c"
 				} else {
 #line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp78_ = FALSE;
-#line 9003 "BatchImport.c"
+#line 9008 "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 9009 "BatchImport.c"
+#line 9014 "BatchImport.c"
 				}
 #line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp83_ = photo;
@@ -9024,11 +9029,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 9023 "BatchImport.c"
+#line 9028 "BatchImport.c"
 			}
 #line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (photo);
-#line 9027 "BatchImport.c"
+#line 9032 "BatchImport.c"
 		}
 #line 1061 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp87_ = job;
@@ -9040,7 +9045,7 @@ 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 9039 "BatchImport.c"
+#line 9044 "BatchImport.c"
 			PreparedFileImportJob* _tmp91_ = NULL;
 			ReadyForImport* _tmp92_ = NULL;
 			BatchImportResult* _tmp93_ = NULL;
@@ -9076,7 +9081,7 @@ 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 9075 "BatchImport.c"
+#line 9080 "BatchImport.c"
 		} else {
 			GeeList* _tmp100_ = NULL;
 			MediaSource* _tmp101_ = NULL;
@@ -9129,19 +9134,19 @@ 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 9128 "BatchImport.c"
+#line 9133 "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 9134 "BatchImport.c"
+#line 9139 "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 9140 "BatchImport.c"
+#line 9145 "BatchImport.c"
 }
 
 
@@ -9178,7 +9183,7 @@ 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 9177 "BatchImport.c"
+#line 9182 "BatchImport.c"
 		PreparedFileImportJob* _tmp5_ = NULL;
 		PreparedFile* _tmp6_ = NULL;
 		BatchImportJob* _tmp7_ = NULL;
@@ -9243,7 +9248,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 9242 "BatchImport.c"
+#line 9247 "BatchImport.c"
 	}
 #line 1089 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp23_ = job;
@@ -9251,7 +9256,7 @@ 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 9250 "BatchImport.c"
+#line 9255 "BatchImport.c"
 		PreparedFileImportJob* _tmp25_ = NULL;
 		BatchImportResult* _tmp26_ = NULL;
 #line 1090 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9262,7 +9267,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 9261 "BatchImport.c"
+#line 9266 "BatchImport.c"
 	}
 #line 1094 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp27_ = job;
@@ -9270,7 +9275,7 @@ 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 9269 "BatchImport.c"
+#line 9274 "BatchImport.c"
 		PreparedFileImportJob* _tmp29_ = NULL;
 		ReadyForImport* _tmp30_ = NULL;
 		BatchImportResult* _tmp31_ = NULL;
@@ -9289,20 +9294,20 @@ 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 9288 "BatchImport.c"
+#line 9293 "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 9294 "BatchImport.c"
+#line 9299 "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 9301 "BatchImport.c"
+#line 9306 "BatchImport.c"
 }
 
 
@@ -9350,7 +9355,7 @@ 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 9349 "BatchImport.c"
+#line 9354 "BatchImport.c"
 		CompletedImportObject* _tmp9_ = NULL;
 		MediaSource* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
@@ -9395,7 +9400,7 @@ 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 9393 "BatchImport.c"
+#line 9398 "BatchImport.c"
 			CompletedImportObject* _tmp20_ = NULL;
 			MediaSource* _tmp21_ = NULL;
 #line 1122 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9404,7 +9409,7 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg
 			_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 9402 "BatchImport.c"
+#line 9407 "BatchImport.c"
 		} else {
 			CompletedImportObject* _tmp22_ = NULL;
 			MediaSource* _tmp23_ = NULL;
@@ -9414,7 +9419,7 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg
 			_tmp23_ = _tmp22_->source;
 #line 1123 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, TYPE_VIDEO)) {
-#line 9412 "BatchImport.c"
+#line 9417 "BatchImport.c"
 				CompletedImportObject* _tmp24_ = NULL;
 				MediaSource* _tmp25_ = NULL;
 #line 1124 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9423,7 +9428,7 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg
 				_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 9421 "BatchImport.c"
+#line 9426 "BatchImport.c"
 			}
 		}
 #line 1126 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9434,7 +9439,7 @@ 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 9432 "BatchImport.c"
+#line 9437 "BatchImport.c"
 	} else {
 		ImportManifest* _tmp28_ = NULL;
 		GeeList* _tmp29_ = NULL;
@@ -9469,7 +9474,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 9467 "BatchImport.c"
+#line 9472 "BatchImport.c"
 	}
 #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_flush_import_jobs (self);
@@ -9477,7 +9482,7 @@ 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 9475 "BatchImport.c"
+#line 9480 "BatchImport.c"
 }
 
 
@@ -9524,7 +9529,7 @@ 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 9522 "BatchImport.c"
+#line 9527 "BatchImport.c"
 		CompletedImportObject* _tmp8_ = NULL;
 		MediaSource* _tmp9_ = NULL;
 #line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9533,7 +9538,7 @@ static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, Backg
 		_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 9531 "BatchImport.c"
+#line 9536 "BatchImport.c"
 	} else {
 		CompletedImportObject* _tmp10_ = NULL;
 		MediaSource* _tmp11_ = NULL;
@@ -9543,7 +9548,7 @@ static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, Backg
 		_tmp11_ = _tmp10_->source;
 #line 1148 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_VIDEO)) {
-#line 9541 "BatchImport.c"
+#line 9546 "BatchImport.c"
 			CompletedImportObject* _tmp12_ = NULL;
 			MediaSource* _tmp13_ = NULL;
 #line 1149 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9552,7 +9557,7 @@ static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, Backg
 			_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 9550 "BatchImport.c"
+#line 9555 "BatchImport.c"
 		}
 	}
 #line 1151 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9569,7 +9574,7 @@ 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 9567 "BatchImport.c"
+#line 9572 "BatchImport.c"
 }
 
 
@@ -9619,7 +9624,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 	if (_tmp2_ == 0) {
 #line 1163 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return;
-#line 9617 "BatchImport.c"
+#line 9622 "BatchImport.c"
 	}
 #line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = self->priv->ready_sources;
@@ -9636,22 +9641,22 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 #line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp7_);
 #line 1170 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp8_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp8_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1170 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	all = _tmp8_;
 #line 1171 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp9_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp9_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1171 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	photos = _tmp9_;
 #line 1172 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp10_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp10_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1172 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	videos = _tmp10_;
 #line 1173 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp11_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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 9649 "BatchImport.c"
+#line 9654 "BatchImport.c"
 	{
 		GeeList* _completed_list = NULL;
 		GeeList* _tmp12_ = NULL;
@@ -9679,7 +9684,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 		_completed_index = -1;
 #line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 9677 "BatchImport.c"
+#line 9682 "BatchImport.c"
 			gint _tmp17_ = 0;
 			gint _tmp18_ = 0;
 			gint _tmp19_ = 0;
@@ -9709,7 +9714,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 			if (!(_tmp18_ < _tmp19_)) {
 #line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 9707 "BatchImport.c"
+#line 9712 "BatchImport.c"
 			}
 #line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp20_ = _completed_list;
@@ -9733,7 +9738,7 @@ 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 9731 "BatchImport.c"
+#line 9736 "BatchImport.c"
 				GeeArrayList* _tmp28_ = NULL;
 				CompletedImportObject* _tmp29_ = NULL;
 				MediaSource* _tmp30_ = NULL;
@@ -9745,7 +9750,7 @@ 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 9743 "BatchImport.c"
+#line 9748 "BatchImport.c"
 			} else {
 				CompletedImportObject* _tmp31_ = NULL;
 				MediaSource* _tmp32_ = NULL;
@@ -9755,7 +9760,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 				_tmp32_ = _tmp31_->source;
 #line 1180 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, TYPE_VIDEO)) {
-#line 9753 "BatchImport.c"
+#line 9758 "BatchImport.c"
 					GeeArrayList* _tmp33_ = NULL;
 					CompletedImportObject* _tmp34_ = NULL;
 					MediaSource* _tmp35_ = NULL;
@@ -9767,7 +9772,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 9765 "BatchImport.c"
+#line 9770 "BatchImport.c"
 				}
 			}
 #line 1183 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9784,11 +9789,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 9782 "BatchImport.c"
+#line 9787 "BatchImport.c"
 		}
 #line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_completed_list);
-#line 9786 "BatchImport.c"
+#line 9791 "BatchImport.c"
 	}
 #line 1186 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp41_ = media_collection_registry_get_instance ();
@@ -9818,7 +9823,7 @@ 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 9816 "BatchImport.c"
+#line 9821 "BatchImport.c"
 	{
 		GeeIterator* _media_it = NULL;
 		GeeHashMap* _tmp49_ = NULL;
@@ -9830,7 +9835,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp49_ = completion_list;
 #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp50_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_MAP, GeeMap));
+		_tmp50_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp51_ = _tmp50_;
 #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9845,7 +9850,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 		_media_it = _tmp54_;
 #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 9843 "BatchImport.c"
+#line 9848 "BatchImport.c"
 			GeeIterator* _tmp55_ = NULL;
 			gboolean _tmp56_ = FALSE;
 			MediaSource* media = NULL;
@@ -9859,7 +9864,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 			if (!_tmp56_) {
 #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 9857 "BatchImport.c"
+#line 9862 "BatchImport.c"
 			}
 #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp57_ = _media_it;
@@ -9867,7 +9872,7 @@ 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 9865 "BatchImport.c"
+#line 9870 "BatchImport.c"
 			{
 				GeeHashMap* _tmp59_ = NULL;
 				MediaSource* _tmp60_ = NULL;
@@ -9893,7 +9898,7 @@ 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 9891 "BatchImport.c"
+#line 9896 "BatchImport.c"
 					goto __catch412_g_error;
 				}
 			}
@@ -9927,7 +9932,7 @@ 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 9924 "BatchImport.c"
+#line 9929 "BatchImport.c"
 			}
 			__finally412:
 #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9950,15 +9955,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 9947 "BatchImport.c"
+#line 9952 "BatchImport.c"
 			}
 #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (media);
-#line 9951 "BatchImport.c"
+#line 9956 "BatchImport.c"
 		}
 #line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_media_it);
-#line 9955 "BatchImport.c"
+#line 9960 "BatchImport.c"
 	}
 #line 1204 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp70_ = all;
@@ -9996,7 +10001,7 @@ 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 9993 "BatchImport.c"
+#line 9998 "BatchImport.c"
 }
 
 
@@ -10029,7 +10034,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
 	_tmp2_ = _tmp1_;
 #line 1216 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp2_ == 0) {
-#line 10026 "BatchImport.c"
+#line 10031 "BatchImport.c"
 		gboolean _tmp3_ = FALSE;
 #line 1217 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = self->priv->completed;
@@ -10037,7 +10042,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
 		result = !_tmp3_;
 #line 1217 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 10034 "BatchImport.c"
+#line 10039 "BatchImport.c"
 	}
 #line 1219 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = self->priv->cancellable;
@@ -10045,7 +10050,7 @@ 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 10042 "BatchImport.c"
+#line 10047 "BatchImport.c"
 		GeeList* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
 		gint _tmp8_ = 0;
@@ -10057,7 +10062,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 10054 "BatchImport.c"
+#line 10059 "BatchImport.c"
 	}
 #line 1222 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_log_status (self, "display_imported_timer");
@@ -10069,7 +10074,7 @@ 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 10066 "BatchImport.c"
+#line 10071 "BatchImport.c"
 		GeeList* _tmp11_ = NULL;
 		gint _tmp12_ = 0;
 		gint _tmp13_ = 0;
@@ -10081,7 +10086,7 @@ 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 10078 "BatchImport.c"
+#line 10083 "BatchImport.c"
 			GeeList* _tmp14_ = NULL;
 			gint _tmp15_ = 0;
 			gint _tmp16_ = 0;
@@ -10096,12 +10101,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 10093 "BatchImport.c"
+#line 10098 "BatchImport.c"
 		}
 	} else {
 #line 1239 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		total = BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW;
-#line 10098 "BatchImport.c"
+#line 10103 "BatchImport.c"
 	}
 #line 1242 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp18_ = total;
@@ -10117,7 +10122,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
 	total = _tmp22_;
 #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	while (TRUE) {
-#line 10114 "BatchImport.c"
+#line 10119 "BatchImport.c"
 		gint _tmp23_ = 0;
 		CompletedImportObject* completed_object = NULL;
 		GeeList* _tmp24_ = NULL;
@@ -10145,7 +10150,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
 		if (!(_tmp23_ > 0)) {
 #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 10142 "BatchImport.c"
+#line 10147 "BatchImport.c"
 		}
 #line 1253 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp24_ = self->priv->display_imported_queue;
@@ -10203,7 +10208,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
 		_g_object_unref0 (user_preview);
 #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_completed_import_object_unref0 (completed_object);
-#line 10200 "BatchImport.c"
+#line 10205 "BatchImport.c"
 	}
 #line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp41_ = self->priv->ready_sources;
@@ -10215,7 +10220,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
 	if (_tmp43_ >= BATCH_IMPORT_READY_SOURCES_COUNT_OVERFLOW) {
 #line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp40_ = TRUE;
-#line 10212 "BatchImport.c"
+#line 10217 "BatchImport.c"
 	} else {
 		GCancellable* _tmp44_ = NULL;
 		gboolean _tmp45_ = FALSE;
@@ -10225,19 +10230,19 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
 		_tmp45_ = g_cancellable_is_cancelled (_tmp44_);
 #line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp40_ = _tmp45_;
-#line 10222 "BatchImport.c"
+#line 10227 "BatchImport.c"
 	}
 #line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp40_) {
 #line 1273 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_flush_ready_sources (self);
-#line 10228 "BatchImport.c"
+#line 10233 "BatchImport.c"
 	}
 #line 1275 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = TRUE;
 #line 1275 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10234 "BatchImport.c"
+#line 10239 "BatchImport.c"
 }
 
 
@@ -10256,19 +10261,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 10253 "BatchImport.c"
+#line 10258 "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 10259 "BatchImport.c"
+#line 10264 "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 10265 "BatchImport.c"
+#line 10270 "BatchImport.c"
 }
 
 
@@ -10287,19 +10292,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 10284 "BatchImport.c"
+#line 10289 "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 10290 "BatchImport.c"
+#line 10295 "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 10296 "BatchImport.c"
+#line 10301 "BatchImport.c"
 }
 
 
@@ -10318,19 +10323,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 10315 "BatchImport.c"
+#line 10320 "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 10321 "BatchImport.c"
+#line 10326 "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 10327 "BatchImport.c"
+#line 10332 "BatchImport.c"
 }
 
 
@@ -10349,19 +10354,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 10346 "BatchImport.c"
+#line 10351 "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 10352 "BatchImport.c"
+#line 10357 "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 10358 "BatchImport.c"
+#line 10363 "BatchImport.c"
 }
 
 
@@ -10380,19 +10385,19 @@ 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 10377 "BatchImport.c"
+#line 10382 "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 10383 "BatchImport.c"
+#line 10388 "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 10389 "BatchImport.c"
+#line 10394 "BatchImport.c"
 }
 
 
@@ -10430,7 +10435,7 @@ 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 10427 "BatchImport.c"
+#line 10432 "BatchImport.c"
 }
 
 
@@ -10460,7 +10465,7 @@ static void batch_import_instance_init (BatchImport * self) {
 #line 428 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->last_preparing_ms = (gulong) 0;
 #line 431 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 431 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->imported_full_md5_table = _tmp0_;
 #line 433 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10474,22 +10479,22 @@ static void batch_import_instance_init (BatchImport * self) {
 #line 436 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->mark_duplicates_online = TRUE;
 #line 440 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = gee_linked_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, prepared_file_unref, NULL, NULL, NULL);
+	_tmp2_ = gee_linked_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, (GDestroyNotify) prepared_file_unref, NULL, NULL, NULL);
 #line 440 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->ready_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList);
 #line 441 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, completed_import_object_unref, NULL, NULL, NULL);
+	_tmp3_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL);
 #line 441 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->ready_thumbnails = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_LIST, GeeList);
 #line 443 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, completed_import_object_unref, NULL, NULL, NULL);
+	_tmp4_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL);
 #line 443 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->display_imported_queue = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList);
 #line 445 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, completed_import_object_unref, NULL, NULL, NULL);
+	_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 10486 "BatchImport.c"
+#line 10491 "BatchImport.c"
 }
 
 
@@ -10534,7 +10539,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 10531 "BatchImport.c"
+#line 10536 "BatchImport.c"
 }
 
 
@@ -10568,21 +10573,21 @@ static DuplicatedFile* duplicated_file_construct (GType object_type) {
 	self->priv->file = NULL;
 #line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 10565 "BatchImport.c"
+#line 10570 "BatchImport.c"
 }
 
 
 static DuplicatedFile* duplicated_file_new (void) {
 #line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return duplicated_file_construct (TYPE_DUPLICATED_FILE);
-#line 10572 "BatchImport.c"
+#line 10577 "BatchImport.c"
 }
 
 
 static gpointer _photo_id_dup0 (gpointer self) {
 #line 1294 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? photo_id_dup (self) : NULL;
-#line 10579 "BatchImport.c"
+#line 10584 "BatchImport.c"
 }
 
 
@@ -10615,14 +10620,14 @@ DuplicatedFile* duplicated_file_create_from_photo_id (PhotoID* photo_id) {
 	result = _result_;
 #line 1295 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10612 "BatchImport.c"
+#line 10617 "BatchImport.c"
 }
 
 
 static gpointer _video_id_dup0 (gpointer self) {
 #line 1302 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? video_id_dup (self) : NULL;
-#line 10619 "BatchImport.c"
+#line 10624 "BatchImport.c"
 }
 
 
@@ -10655,7 +10660,7 @@ DuplicatedFile* duplicated_file_create_from_video_id (VideoID* video_id) {
 	result = _result_;
 #line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10652 "BatchImport.c"
+#line 10657 "BatchImport.c"
 }
 
 
@@ -10683,7 +10688,7 @@ DuplicatedFile* duplicated_file_create_from_file (GFile* file) {
 	result = _result_;
 #line 1311 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10680 "BatchImport.c"
+#line 10685 "BatchImport.c"
 }
 
 
@@ -10696,7 +10701,7 @@ GFile* duplicated_file_get_file (DuplicatedFile* self) {
 	_tmp0_ = self->priv->file;
 #line 1315 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_ != NULL) {
-#line 10693 "BatchImport.c"
+#line 10698 "BatchImport.c"
 		GFile* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
 #line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10707,14 +10712,14 @@ GFile* duplicated_file_get_file (DuplicatedFile* self) {
 		result = _tmp2_;
 #line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 10704 "BatchImport.c"
+#line 10709 "BatchImport.c"
 	} else {
 		PhotoID* _tmp3_ = NULL;
 #line 1317 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = self->priv->photo_id;
 #line 1317 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp3_ != NULL) {
-#line 10711 "BatchImport.c"
+#line 10716 "BatchImport.c"
 			Photo* photo_object = NULL;
 			LibraryPhotoSourceCollection* _tmp4_ = NULL;
 			PhotoID* _tmp5_ = NULL;
@@ -10752,14 +10757,14 @@ GFile* duplicated_file_get_file (DuplicatedFile* self) {
 			_g_object_unref0 (photo_object);
 #line 1320 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 10749 "BatchImport.c"
+#line 10754 "BatchImport.c"
 		} else {
 			VideoID* _tmp12_ = NULL;
 #line 1321 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp12_ = self->priv->video_id;
 #line 1321 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp12_ != NULL) {
-#line 10756 "BatchImport.c"
+#line 10761 "BatchImport.c"
 				Video* video_object = NULL;
 				VideoSourceCollection* _tmp13_ = NULL;
 				VideoID* _tmp14_ = NULL;
@@ -10797,11 +10802,11 @@ GFile* duplicated_file_get_file (DuplicatedFile* self) {
 				_g_object_unref0 (video_object);
 #line 1324 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return result;
-#line 10794 "BatchImport.c"
+#line 10799 "BatchImport.c"
 			} else {
 #line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_assert_not_reached ();
-#line 10798 "BatchImport.c"
+#line 10803 "BatchImport.c"
 			}
 		}
 	}
@@ -10815,14 +10820,14 @@ static void duplicated_file_class_init (DuplicatedFileClass * klass) {
 	g_type_class_add_private (klass, sizeof (DuplicatedFilePrivate));
 #line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_OBJECT_CLASS (klass)->finalize = duplicated_file_finalize;
-#line 10812 "BatchImport.c"
+#line 10817 "BatchImport.c"
 }
 
 
 static void duplicated_file_instance_init (DuplicatedFile * self) {
 #line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv = DUPLICATED_FILE_GET_PRIVATE (self);
-#line 10819 "BatchImport.c"
+#line 10824 "BatchImport.c"
 }
 
 
@@ -10838,7 +10843,7 @@ static void duplicated_file_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->file);
 #line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_OBJECT_CLASS (duplicated_file_parent_class)->finalize (obj);
-#line 10835 "BatchImport.c"
+#line 10840 "BatchImport.c"
 }
 
 
@@ -10882,7 +10887,7 @@ BackgroundImportJob* background_import_job_construct (GType object_type, BatchIm
 	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"
 	return self;
-#line 10879 "BatchImport.c"
+#line 10884 "BatchImport.c"
 }
 
 
@@ -10897,23 +10902,23 @@ ImportResult background_import_job_abort_check (BackgroundImportJob* self) {
 	_tmp1_ = self->abort_flag;
 #line 1361 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ == IMPORT_RESULT_SUCCESS) {
-#line 10894 "BatchImport.c"
+#line 10899 "BatchImport.c"
 		gboolean _tmp2_ = FALSE;
 #line 1361 "/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"
 		_tmp0_ = _tmp2_;
-#line 10900 "BatchImport.c"
+#line 10905 "BatchImport.c"
 	} else {
 #line 1361 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = FALSE;
-#line 10904 "BatchImport.c"
+#line 10909 "BatchImport.c"
 	}
 #line 1361 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_) {
 #line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->abort_flag = IMPORT_RESULT_USER_ABORT;
-#line 10910 "BatchImport.c"
+#line 10915 "BatchImport.c"
 	}
 #line 1364 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = self->abort_flag;
@@ -10921,7 +10926,7 @@ ImportResult background_import_job_abort_check (BackgroundImportJob* self) {
 	result = _tmp3_;
 #line 1364 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10918 "BatchImport.c"
+#line 10923 "BatchImport.c"
 }
 
 
@@ -10933,13 +10938,13 @@ void background_import_job_abort (BackgroundImportJob* self, ImportResult _resul
 	_tmp0_ = self->abort_flag;
 #line 1369 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_ == IMPORT_RESULT_SUCCESS) {
-#line 10930 "BatchImport.c"
+#line 10935 "BatchImport.c"
 		ImportResult _tmp1_ = 0;
 #line 1370 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp1_ = _result_;
 #line 1370 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->abort_flag = _tmp1_;
-#line 10936 "BatchImport.c"
+#line 10941 "BatchImport.c"
 	}
 }
 
@@ -10976,13 +10981,13 @@ void background_import_job_report_failure (BackgroundImportJob* self, BatchImpor
 	_tmp2_ = import_result_is_abort (_tmp1_);
 #line 1378 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp2_) {
-#line 10973 "BatchImport.c"
+#line 10978 "BatchImport.c"
 		ImportResult _tmp3_ = 0;
 #line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = _result_;
 #line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		background_import_job_abort (self, _tmp3_);
-#line 10979 "BatchImport.c"
+#line 10984 "BatchImport.c"
 	} else {
 		const gchar* _tmp4_ = NULL;
 		ImportResult _tmp5_ = 0;
@@ -11000,7 +11005,7 @@ void background_import_job_report_failure (BackgroundImportJob* self, BatchImpor
 		g_warning ("BatchImport.vala:1381: Import failure %s: %s", _tmp4_, _tmp7_);
 #line 1381 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp7_);
-#line 10997 "BatchImport.c"
+#line 11002 "BatchImport.c"
 	}
 #line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = self->failed;
@@ -11022,7 +11027,7 @@ void background_import_job_report_failure (BackgroundImportJob* self, BatchImpor
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_);
 #line 1383 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (_tmp15_);
-#line 11019 "BatchImport.c"
+#line 11024 "BatchImport.c"
 }
 
 
@@ -11088,13 +11093,13 @@ void background_import_job_report_error (BackgroundImportJob* self, BatchImportJ
 	_tmp10_ = import_result_is_abort (_tmp9_);
 #line 1393 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp10_) {
-#line 11085 "BatchImport.c"
+#line 11090 "BatchImport.c"
 		ImportResult _tmp11_ = 0;
 #line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp11_ = _result_;
 #line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		background_import_job_abort (self, _tmp11_);
-#line 11091 "BatchImport.c"
+#line 11096 "BatchImport.c"
 	}
 #line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp12_ = self->failed;
@@ -11118,7 +11123,7 @@ void background_import_job_report_error (BackgroundImportJob* self, BatchImportJ
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_);
 #line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (_tmp20_);
-#line 11115 "BatchImport.c"
+#line 11120 "BatchImport.c"
 }
 
 
@@ -11127,7 +11132,7 @@ static void background_import_job_class_init (BackgroundImportJobClass * klass)
 	background_import_job_parent_class = g_type_class_peek_parent (klass);
 #line 1349 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BackgroundJobClass *) klass)->finalize = background_import_job_finalize;
-#line 11124 "BatchImport.c"
+#line 11129 "BatchImport.c"
 }
 
 
@@ -11136,10 +11141,10 @@ static void background_import_job_instance_init (BackgroundImportJob * self) {
 #line 1350 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->abort_flag = IMPORT_RESULT_SUCCESS;
 #line 1351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, batch_import_result_unref, NULL, NULL, NULL);
+	_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"
 	self->failed = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 11136 "BatchImport.c"
+#line 11141 "BatchImport.c"
 }
 
 
@@ -11151,7 +11156,7 @@ static void background_import_job_finalize (BackgroundJob* obj) {
 	_g_object_unref0 (self->failed);
 #line 1349 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BACKGROUND_JOB_CLASS (background_import_job_parent_class)->finalize (obj);
-#line 11148 "BatchImport.c"
+#line 11153 "BatchImport.c"
 }
 
 
@@ -11202,21 +11207,21 @@ FileToPrepare* file_to_prepare_construct (GType object_type, BatchImportJob* job
 	self->copy_to_library = _tmp4_;
 #line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 11199 "BatchImport.c"
+#line 11204 "BatchImport.c"
 }
 
 
 FileToPrepare* file_to_prepare_new (BatchImportJob* job, GFile* file, gboolean copy_to_library) {
 #line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return file_to_prepare_construct (TYPE_FILE_TO_PREPARE, job, file, copy_to_library);
-#line 11206 "BatchImport.c"
+#line 11211 "BatchImport.c"
 }
 
 
 static gpointer _file_to_prepare_ref0 (gpointer self) {
 #line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? file_to_prepare_ref (self) : NULL;
-#line 11213 "BatchImport.c"
+#line 11218 "BatchImport.c"
 }
 
 
@@ -11235,7 +11240,7 @@ void file_to_prepare_set_associated (FileToPrepare* self, FileToPrepare* a) {
 	_file_to_prepare_unref0 (self->associated);
 #line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->associated = _tmp1_;
-#line 11232 "BatchImport.c"
+#line 11237 "BatchImport.c"
 }
 
 
@@ -11249,7 +11254,7 @@ gchar* file_to_prepare_get_parent_path (FileToPrepare* self) {
 	_tmp1_ = self->file;
 #line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 11246 "BatchImport.c"
+#line 11251 "BatchImport.c"
 		GFile* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
@@ -11268,7 +11273,7 @@ gchar* file_to_prepare_get_parent_path (FileToPrepare* self) {
 		_tmp0_ = _tmp5_;
 #line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_tmp4_);
-#line 11265 "BatchImport.c"
+#line 11270 "BatchImport.c"
 	} else {
 		BatchImportJob* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
@@ -11280,13 +11285,13 @@ gchar* file_to_prepare_get_parent_path (FileToPrepare* self) {
 		_g_free0 (_tmp0_);
 #line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp7_;
-#line 11277 "BatchImport.c"
+#line 11282 "BatchImport.c"
 	}
 #line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp0_;
 #line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 11283 "BatchImport.c"
+#line 11288 "BatchImport.c"
 }
 
 
@@ -11300,7 +11305,7 @@ gchar* file_to_prepare_get_path (FileToPrepare* self) {
 	_tmp1_ = self->file;
 #line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 11297 "BatchImport.c"
+#line 11302 "BatchImport.c"
 		GFile* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 #line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -11311,7 +11316,7 @@ gchar* file_to_prepare_get_path (FileToPrepare* self) {
 		_g_free0 (_tmp0_);
 #line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp3_;
-#line 11308 "BatchImport.c"
+#line 11313 "BatchImport.c"
 	} else {
 		BatchImportJob* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -11358,13 +11363,13 @@ gchar* file_to_prepare_get_path (FileToPrepare* self) {
 		_g_object_unref0 (_tmp8_);
 #line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp6_);
-#line 11355 "BatchImport.c"
+#line 11360 "BatchImport.c"
 	}
 #line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp0_;
 #line 1422 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 11361 "BatchImport.c"
+#line 11366 "BatchImport.c"
 }
 
 
@@ -11378,7 +11383,7 @@ gchar* file_to_prepare_get_basename (FileToPrepare* self) {
 	_tmp1_ = self->file;
 #line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 11375 "BatchImport.c"
+#line 11380 "BatchImport.c"
 		GFile* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 #line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -11389,7 +11394,7 @@ gchar* file_to_prepare_get_basename (FileToPrepare* self) {
 		_g_free0 (_tmp0_);
 #line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp3_;
-#line 11386 "BatchImport.c"
+#line 11391 "BatchImport.c"
 	} else {
 		BatchImportJob* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -11401,13 +11406,13 @@ gchar* file_to_prepare_get_basename (FileToPrepare* self) {
 		_g_free0 (_tmp0_);
 #line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp5_;
-#line 11398 "BatchImport.c"
+#line 11403 "BatchImport.c"
 	}
 #line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp0_;
 #line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 11404 "BatchImport.c"
+#line 11409 "BatchImport.c"
 }
 
 
@@ -11421,7 +11426,7 @@ gboolean file_to_prepare_is_directory (FileToPrepare* self) {
 	_tmp1_ = self->file;
 #line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 11418 "BatchImport.c"
+#line 11423 "BatchImport.c"
 		GFile* _tmp2_ = NULL;
 		GFileType _tmp3_ = 0;
 #line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -11430,7 +11435,7 @@ gboolean file_to_prepare_is_directory (FileToPrepare* self) {
 		_tmp3_ = g_file_query_file_type (_tmp2_, G_FILE_QUERY_INFO_NONE, NULL);
 #line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp3_ == G_FILE_TYPE_DIRECTORY;
-#line 11427 "BatchImport.c"
+#line 11432 "BatchImport.c"
 	} else {
 		BatchImportJob* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
@@ -11440,20 +11445,20 @@ gboolean file_to_prepare_is_directory (FileToPrepare* self) {
 		_tmp5_ = batch_import_job_is_directory (_tmp4_);
 #line 1432 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp5_;
-#line 11437 "BatchImport.c"
+#line 11442 "BatchImport.c"
 	}
 #line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp0_;
 #line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 11443 "BatchImport.c"
+#line 11448 "BatchImport.c"
 }
 
 
 static void value_file_to_prepare_init (GValue* value) {
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 11450 "BatchImport.c"
+#line 11455 "BatchImport.c"
 }
 
 
@@ -11462,7 +11467,7 @@ static void value_file_to_prepare_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		file_to_prepare_unref (value->data[0].v_pointer);
-#line 11459 "BatchImport.c"
+#line 11464 "BatchImport.c"
 	}
 }
 
@@ -11472,11 +11477,11 @@ static void value_file_to_prepare_copy_value (const GValue* src_value, GValue* d
 	if (src_value->data[0].v_pointer) {
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = file_to_prepare_ref (src_value->data[0].v_pointer);
-#line 11469 "BatchImport.c"
+#line 11474 "BatchImport.c"
 	} else {
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 11473 "BatchImport.c"
+#line 11478 "BatchImport.c"
 	}
 }
 
@@ -11484,37 +11489,37 @@ static void value_file_to_prepare_copy_value (const GValue* src_value, GValue* d
 static gpointer value_file_to_prepare_peek_pointer (const GValue* value) {
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 11481 "BatchImport.c"
+#line 11486 "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"
 	if (collect_values[0].v_pointer) {
-#line 11488 "BatchImport.c"
+#line 11493 "BatchImport.c"
 		FileToPrepare* object;
 		object = collect_values[0].v_pointer;
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 11495 "BatchImport.c"
+#line 11500 "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"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 11499 "BatchImport.c"
+#line 11504 "BatchImport.c"
 		}
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = file_to_prepare_ref (object);
-#line 11503 "BatchImport.c"
+#line 11508 "BatchImport.c"
 	} else {
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 11507 "BatchImport.c"
+#line 11512 "BatchImport.c"
 	}
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 11511 "BatchImport.c"
+#line 11516 "BatchImport.c"
 }
 
 
@@ -11525,25 +11530,25 @@ static gchar* value_file_to_prepare_lcopy_value (const GValue* value, guint n_co
 	if (!object_p) {
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 11522 "BatchImport.c"
+#line 11527 "BatchImport.c"
 	}
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 11528 "BatchImport.c"
+#line 11533 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 11532 "BatchImport.c"
+#line 11537 "BatchImport.c"
 	} else {
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = file_to_prepare_ref (value->data[0].v_pointer);
-#line 11536 "BatchImport.c"
+#line 11541 "BatchImport.c"
 	}
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 11540 "BatchImport.c"
+#line 11545 "BatchImport.c"
 }
 
 
@@ -11557,7 +11562,7 @@ GParamSpec* param_spec_file_to_prepare (const gchar* name, const gchar* nick, co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 11554 "BatchImport.c"
+#line 11559 "BatchImport.c"
 }
 
 
@@ -11566,7 +11571,7 @@ gpointer value_get_file_to_prepare (const GValue* value) {
 	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"
 	return value->data[0].v_pointer;
-#line 11563 "BatchImport.c"
+#line 11568 "BatchImport.c"
 }
 
 
@@ -11586,17 +11591,17 @@ void value_set_file_to_prepare (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		file_to_prepare_ref (value->data[0].v_pointer);
-#line 11583 "BatchImport.c"
+#line 11588 "BatchImport.c"
 	} else {
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 11587 "BatchImport.c"
+#line 11592 "BatchImport.c"
 	}
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		file_to_prepare_unref (old);
-#line 11593 "BatchImport.c"
+#line 11598 "BatchImport.c"
 	}
 }
 
@@ -11615,17 +11620,17 @@ void value_take_file_to_prepare (GValue* value, gpointer v_object) {
 		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"
 		value->data[0].v_pointer = v_object;
-#line 11612 "BatchImport.c"
+#line 11617 "BatchImport.c"
 	} else {
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 11616 "BatchImport.c"
+#line 11621 "BatchImport.c"
 	}
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		file_to_prepare_unref (old);
-#line 11622 "BatchImport.c"
+#line 11627 "BatchImport.c"
 	}
 }
 
@@ -11635,7 +11640,7 @@ static void file_to_prepare_class_init (FileToPrepareClass * klass) {
 	file_to_prepare_parent_class = g_type_class_peek_parent (klass);
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((FileToPrepareClass *) klass)->finalize = file_to_prepare_finalize;
-#line 11632 "BatchImport.c"
+#line 11637 "BatchImport.c"
 }
 
 
@@ -11644,7 +11649,7 @@ static void file_to_prepare_instance_init (FileToPrepare * self) {
 	self->associated = NULL;
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 11641 "BatchImport.c"
+#line 11646 "BatchImport.c"
 }
 
 
@@ -11660,7 +11665,7 @@ static void file_to_prepare_finalize (FileToPrepare* obj) {
 	_g_object_unref0 (self->file);
 #line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_file_to_prepare_unref0 (self->associated);
-#line 11657 "BatchImport.c"
+#line 11662 "BatchImport.c"
 }
 
 
@@ -11685,7 +11690,7 @@ gpointer file_to_prepare_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 11682 "BatchImport.c"
+#line 11687 "BatchImport.c"
 }
 
 
@@ -11698,7 +11703,7 @@ void file_to_prepare_unref (gpointer instance) {
 		FILE_TO_PREPARE_GET_CLASS (self)->finalize (self);
 #line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 11695 "BatchImport.c"
+#line 11700 "BatchImport.c"
 	}
 }
 
@@ -11755,14 +11760,14 @@ WorkSniffer* work_sniffer_construct (GType object_type, BatchImport* owner, GeeI
 	self->priv->skipset = _tmp7_;
 #line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 11752 "BatchImport.c"
+#line 11757 "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"
 	return work_sniffer_construct (TYPE_WORK_SNIFFER, owner, jobs, callback, callback_target, cancellable, cancellation, cancellation_target, skipset);
-#line 11759 "BatchImport.c"
+#line 11764 "BatchImport.c"
 }
 
 
@@ -11817,7 +11822,7 @@ static gint __lambda10_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b)
 	_file_to_prepare_unref0 (file_a);
 #line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 11814 "BatchImport.c"
+#line 11819 "BatchImport.c"
 }
 
 
@@ -11826,7 +11831,7 @@ static gint ___lambda10__gcompare_data_func (gconstpointer a, gconstpointer b, g
 	result = __lambda10_ ((WorkSniffer*) self, (FileToPrepare*) a, (FileToPrepare*) b);
 #line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 11823 "BatchImport.c"
+#line 11828 "BatchImport.c"
 }
 
 
@@ -11838,7 +11843,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 	GError * _inner_error_ = NULL;
 #line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_WORK_SNIFFER, WorkSniffer);
-#line 11835 "BatchImport.c"
+#line 11840 "BatchImport.c"
 	{
 		GeeIterator* _job_it = NULL;
 		GeeIterable* _tmp0_ = NULL;
@@ -11851,7 +11856,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 		_job_it = _tmp1_;
 #line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 11848 "BatchImport.c"
+#line 11853 "BatchImport.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			BatchImportJob* job = NULL;
@@ -11869,7 +11874,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 			if (!_tmp3_) {
 #line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 11866 "BatchImport.c"
+#line 11871 "BatchImport.c"
 			}
 #line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp4_ = _job_it;
@@ -11885,7 +11890,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 			_tmp7_ = _result_;
 #line 1457 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp7_ != IMPORT_RESULT_SUCCESS) {
-#line 11882 "BatchImport.c"
+#line 11887 "BatchImport.c"
 				BatchImportJob* _tmp8_ = NULL;
 				BatchImportJob* _tmp9_ = NULL;
 				gchar* _tmp10_ = NULL;
@@ -11920,7 +11925,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 				_batch_import_job_unref0 (job);
 #line 1461 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 11917 "BatchImport.c"
+#line 11922 "BatchImport.c"
 			}
 			{
 				BatchImportJob* _tmp16_ = NULL;
@@ -11930,7 +11935,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 				work_sniffer_sniff_job (self, _tmp16_, &_inner_error_);
 #line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11927 "BatchImport.c"
+#line 11932 "BatchImport.c"
 					goto __catch413_g_error;
 				}
 			}
@@ -11974,7 +11979,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 				_g_free0 (_tmp20_);
 #line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_error_free0 (err);
-#line 11971 "BatchImport.c"
+#line 11976 "BatchImport.c"
 			}
 			__finally413:
 #line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -11989,7 +11994,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 				g_clear_error (&_inner_error_);
 #line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return;
-#line 11986 "BatchImport.c"
+#line 11991 "BatchImport.c"
 			}
 #line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp25_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
@@ -11999,21 +12004,21 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 				_batch_import_job_unref0 (job);
 #line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 11996 "BatchImport.c"
+#line 12001 "BatchImport.c"
 			}
 #line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_batch_import_job_unref0 (job);
-#line 12000 "BatchImport.c"
+#line 12005 "BatchImport.c"
 		}
 #line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_job_it);
-#line 12004 "BatchImport.c"
+#line 12009 "BatchImport.c"
 	}
 #line 1478 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp26_ = gee_array_list_new (TYPE_FILE_TO_PREPARE, (GBoxedCopyFunc) file_to_prepare_ref, file_to_prepare_unref, NULL, NULL, NULL);
+	_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"
 	sorted = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_LIST, GeeList);
-#line 12010 "BatchImport.c"
+#line 12015 "BatchImport.c"
 	{
 		GeeList* _ftp_list = NULL;
 		GeeList* _tmp27_ = NULL;
@@ -12041,7 +12046,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 		_ftp_index = -1;
 #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 12038 "BatchImport.c"
+#line 12043 "BatchImport.c"
 			gint _tmp32_ = 0;
 			gint _tmp33_ = 0;
 			gint _tmp34_ = 0;
@@ -12063,7 +12068,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 			if (!(_tmp33_ < _tmp34_)) {
 #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 12060 "BatchImport.c"
+#line 12065 "BatchImport.c"
 			}
 #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp35_ = _ftp_list;
@@ -12079,7 +12084,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 			_tmp39_ = file_to_prepare_is_directory (_tmp38_);
 #line 1480 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (!_tmp39_) {
-#line 12076 "BatchImport.c"
+#line 12081 "BatchImport.c"
 				GeeList* _tmp40_ = NULL;
 				FileToPrepare* _tmp41_ = NULL;
 #line 1481 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -12088,33 +12093,33 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 				_tmp41_ = ftp;
 #line 1481 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_COLLECTION, GeeCollection), _tmp41_);
-#line 12085 "BatchImport.c"
+#line 12090 "BatchImport.c"
 			}
 #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_file_to_prepare_unref0 (ftp);
-#line 12089 "BatchImport.c"
+#line 12094 "BatchImport.c"
 		}
 #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_ftp_list);
-#line 12093 "BatchImport.c"
+#line 12098 "BatchImport.c"
 	}
 #line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp42_ = sorted;
 #line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	gee_list_sort (_tmp42_, ___lambda10__gcompare_data_func, background_job_ref (self), background_job_unref);
-#line 12099 "BatchImport.c"
+#line 12104 "BatchImport.c"
 	{
 		gint i = 0;
 #line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		i = 0;
-#line 12104 "BatchImport.c"
+#line 12109 "BatchImport.c"
 		{
 			gboolean _tmp43_ = FALSE;
 #line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp43_ = TRUE;
 #line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			while (TRUE) {
-#line 12111 "BatchImport.c"
+#line 12116 "BatchImport.c"
 				gint _tmp45_ = 0;
 				GeeList* _tmp46_ = NULL;
 				gint _tmp47_ = 0;
@@ -12139,13 +12144,13 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 				gboolean _tmp63_ = FALSE;
 #line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (!_tmp43_) {
-#line 12136 "BatchImport.c"
+#line 12141 "BatchImport.c"
 					gint _tmp44_ = 0;
 #line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp44_ = i;
 #line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					i = _tmp44_ + 1;
-#line 12142 "BatchImport.c"
+#line 12147 "BatchImport.c"
 				}
 #line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp43_ = FALSE;
@@ -12161,7 +12166,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 				if (!(_tmp45_ < _tmp48_)) {
 #line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					break;
-#line 12158 "BatchImport.c"
+#line 12163 "BatchImport.c"
 				}
 #line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp49_ = sorted;
@@ -12203,7 +12208,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 					_g_free0 (name);
 #line 1499 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					continue;
-#line 12200 "BatchImport.c"
+#line 12205 "BatchImport.c"
 				}
 #line 1501 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp59_ = raw_file_format_properties_get_instance ();
@@ -12219,14 +12224,14 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 				_photo_file_format_properties_unref0 (_tmp60_);
 #line 1501 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_tmp63_) {
-#line 12216 "BatchImport.c"
+#line 12221 "BatchImport.c"
 					gboolean _tmp64_ = FALSE;
 					gint _tmp65_ = 0;
 #line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp65_ = i;
 #line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (_tmp65_ > 0) {
-#line 12223 "BatchImport.c"
+#line 12228 "BatchImport.c"
 						FileToPrepare* _tmp66_ = NULL;
 						GeeList* _tmp67_ = NULL;
 						gint _tmp68_ = 0;
@@ -12249,15 +12254,15 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 						_tmp64_ = _tmp71_;
 #line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_file_to_prepare_unref0 (_tmp70_);
-#line 12246 "BatchImport.c"
+#line 12251 "BatchImport.c"
 					} else {
 #line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp64_ = FALSE;
-#line 12250 "BatchImport.c"
+#line 12255 "BatchImport.c"
 					}
 #line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (_tmp64_) {
-#line 12254 "BatchImport.c"
+#line 12259 "BatchImport.c"
 						FileToPrepare* associated_file = NULL;
 						GeeList* _tmp72_ = NULL;
 						gint _tmp73_ = 0;
@@ -12288,7 +12293,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 						file_to_prepare_set_associated (_tmp77_, _tmp78_);
 #line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_file_to_prepare_unref0 (associated_file);
-#line 12285 "BatchImport.c"
+#line 12290 "BatchImport.c"
 					} else {
 						gboolean _tmp79_ = FALSE;
 						gint _tmp80_ = 0;
@@ -12305,7 +12310,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 						_tmp83_ = _tmp82_;
 #line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_tmp80_ < (_tmp83_ - 1)) {
-#line 12302 "BatchImport.c"
+#line 12307 "BatchImport.c"
 							FileToPrepare* _tmp84_ = NULL;
 							GeeList* _tmp85_ = NULL;
 							gint _tmp86_ = 0;
@@ -12328,15 +12333,15 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 							_tmp79_ = _tmp89_;
 #line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_file_to_prepare_unref0 (_tmp88_);
-#line 12325 "BatchImport.c"
+#line 12330 "BatchImport.c"
 						} else {
 #line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp79_ = FALSE;
-#line 12329 "BatchImport.c"
+#line 12334 "BatchImport.c"
 						}
 #line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_tmp79_) {
-#line 12333 "BatchImport.c"
+#line 12338 "BatchImport.c"
 							FileToPrepare* associated_file = NULL;
 							GeeList* _tmp90_ = NULL;
 							gint _tmp91_ = 0;
@@ -12367,7 +12372,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 							file_to_prepare_set_associated (_tmp95_, _tmp96_);
 #line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_file_to_prepare_unref0 (associated_file);
-#line 12364 "BatchImport.c"
+#line 12369 "BatchImport.c"
 						}
 					}
 				}
@@ -12377,13 +12382,13 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 				_g_free0 (ext);
 #line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (name);
-#line 12374 "BatchImport.c"
+#line 12379 "BatchImport.c"
 			}
 		}
 	}
 #line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (sorted);
-#line 12380 "BatchImport.c"
+#line 12385 "BatchImport.c"
 }
 
 
@@ -12447,7 +12452,7 @@ static gboolean work_sniffer_is_paired (WorkSniffer* self, FileToPrepare* raw, F
 		result = FALSE;
 #line 1522 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 12444 "BatchImport.c"
+#line 12449 "BatchImport.c"
 	}
 #line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = maybe_paired;
@@ -12493,7 +12498,7 @@ static gboolean work_sniffer_is_paired (WorkSniffer* self, FileToPrepare* raw, F
 		_g_free0 (name);
 #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 12490 "BatchImport.c"
+#line 12495 "BatchImport.c"
 	}
 #line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp17_ = raw;
@@ -12529,7 +12534,7 @@ static gboolean work_sniffer_is_paired (WorkSniffer* self, FileToPrepare* raw, F
 	_g_free0 (name);
 #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 12526 "BatchImport.c"
+#line 12531 "BatchImport.c"
 }
 
 
@@ -12565,7 +12570,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 	_tmp4_ = determined_size;
 #line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp4_) {
-#line 12562 "BatchImport.c"
+#line 12567 "BatchImport.c"
 		guint64 _tmp5_ = 0ULL;
 		guint64 _tmp6_ = 0ULL;
 #line 1540 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -12574,7 +12579,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 		_tmp6_ = size;
 #line 1540 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->total_bytes = _tmp5_ + _tmp6_;
-#line 12571 "BatchImport.c"
+#line 12576 "BatchImport.c"
 	}
 #line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = job;
@@ -12582,7 +12587,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 	_tmp8_ = batch_import_job_is_directory (_tmp7_);
 #line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp8_) {
-#line 12579 "BatchImport.c"
+#line 12584 "BatchImport.c"
 		GFile* dir = NULL;
 		gboolean copy_to_library = FALSE;
 		gboolean _tmp9_ = FALSE;
@@ -12614,11 +12619,11 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 			_g_object_unref0 (file_or_dir);
 #line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 12611 "BatchImport.c"
+#line 12616 "BatchImport.c"
 		}
 #line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!_tmp9_) {
-#line 12615 "BatchImport.c"
+#line 12620 "BatchImport.c"
 			BatchImportJob* _tmp14_ = NULL;
 			BatchImportJob* _tmp15_ = NULL;
 			gchar* _tmp16_ = NULL;
@@ -12652,7 +12657,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 			_g_object_unref0 (file_or_dir);
 #line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 12649 "BatchImport.c"
+#line 12654 "BatchImport.c"
 		}
 #line 1553 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp21_ = dir;
@@ -12660,7 +12665,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 		_tmp22_ = query_is_directory (_tmp21_);
 #line 1553 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_vala_assert (_tmp22_, "query_is_directory(dir)");
-#line 12657 "BatchImport.c"
+#line 12662 "BatchImport.c"
 		{
 			BatchImportJob* _tmp23_ = NULL;
 			GFile* _tmp24_ = NULL;
@@ -12675,7 +12680,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 			work_sniffer_search_dir (self, _tmp23_, _tmp24_, _tmp25_, &_inner_error_);
 #line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12672 "BatchImport.c"
+#line 12677 "BatchImport.c"
 				goto __catch414_g_error;
 			}
 		}
@@ -12722,7 +12727,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 			_g_free0 (_tmp30_);
 #line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (err);
-#line 12719 "BatchImport.c"
+#line 12724 "BatchImport.c"
 		}
 		__finally414:
 #line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -12735,11 +12740,11 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 			_g_object_unref0 (file_or_dir);
 #line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 12732 "BatchImport.c"
+#line 12737 "BatchImport.c"
 		}
 #line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (dir);
-#line 12736 "BatchImport.c"
+#line 12741 "BatchImport.c"
 	} else {
 		gboolean _tmp35_ = FALSE;
 		gboolean _tmp43_ = FALSE;
@@ -12753,7 +12758,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 		_tmp35_ = determined_size;
 #line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!_tmp35_) {
-#line 12750 "BatchImport.c"
+#line 12755 "BatchImport.c"
 			guint64 _tmp36_ = 0ULL;
 			GFile* _tmp37_ = NULL;
 			GCancellable* _tmp38_ = NULL;
@@ -12783,33 +12788,33 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 				_g_object_unref0 (file_or_dir);
 #line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return;
-#line 12780 "BatchImport.c"
+#line 12785 "BatchImport.c"
 			}
 #line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp42_ = self->total_bytes;
 #line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			self->total_bytes = _tmp42_ + _tmp36_;
-#line 12786 "BatchImport.c"
+#line 12791 "BatchImport.c"
 		}
 #line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp45_ = file_or_dir;
 #line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp45_ != NULL) {
-#line 12792 "BatchImport.c"
+#line 12797 "BatchImport.c"
 			GeeHashSet* _tmp46_ = NULL;
 #line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp46_ = self->priv->skipset;
 #line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp44_ = _tmp46_ != NULL;
-#line 12798 "BatchImport.c"
+#line 12803 "BatchImport.c"
 		} else {
 #line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp44_ = FALSE;
-#line 12802 "BatchImport.c"
+#line 12807 "BatchImport.c"
 		}
 #line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp44_) {
-#line 12806 "BatchImport.c"
+#line 12811 "BatchImport.c"
 			GeeHashSet* _tmp47_ = NULL;
 			GFile* _tmp48_ = NULL;
 			gboolean _tmp49_ = FALSE;
@@ -12821,11 +12826,11 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 			_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"
 			_tmp43_ = _tmp49_;
-#line 12818 "BatchImport.c"
+#line 12823 "BatchImport.c"
 		} else {
 #line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp43_ = FALSE;
-#line 12822 "BatchImport.c"
+#line 12827 "BatchImport.c"
 		}
 #line 1567 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp43_) {
@@ -12833,7 +12838,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 			_g_object_unref0 (file_or_dir);
 #line 1568 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 12830 "BatchImport.c"
+#line 12835 "BatchImport.c"
 		}
 #line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp50_ = self->files_to_prepare;
@@ -12847,11 +12852,11 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection), _tmp53_);
 #line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_file_to_prepare_unref0 (_tmp53_);
-#line 12844 "BatchImport.c"
+#line 12849 "BatchImport.c"
 	}
 #line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (file_or_dir);
-#line 12848 "BatchImport.c"
+#line 12853 "BatchImport.c"
 }
 
 
@@ -12879,13 +12884,13 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 		g_propagate_error (error, _inner_error_);
 #line 1576 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return;
-#line 12876 "BatchImport.c"
+#line 12881 "BatchImport.c"
 	}
 #line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	info = NULL;
 #line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	while (TRUE) {
-#line 12882 "BatchImport.c"
+#line 12887 "BatchImport.c"
 		GFileInfo* _tmp2_ = NULL;
 		GFileEnumerator* _tmp3_ = NULL;
 		GCancellable* _tmp4_ = NULL;
@@ -12928,7 +12933,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 			_g_object_unref0 (enumerator);
 #line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 12925 "BatchImport.c"
+#line 12930 "BatchImport.c"
 		}
 #line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = _tmp2_;
@@ -12946,7 +12951,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 			_g_object_unref0 (_tmp2_);
 #line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 12943 "BatchImport.c"
+#line 12948 "BatchImport.c"
 		}
 #line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp10_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
@@ -12956,7 +12961,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 			_g_object_unref0 (_tmp2_);
 #line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 12953 "BatchImport.c"
+#line 12958 "BatchImport.c"
 		}
 #line 1585 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp11_ = dir;
@@ -12978,7 +12983,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 		_tmp17_ = file_type;
 #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp17_ == G_FILE_TYPE_DIRECTORY) {
-#line 12975 "BatchImport.c"
+#line 12980 "BatchImport.c"
 			GFileInfo* _tmp18_ = NULL;
 			const gchar* _tmp19_ = NULL;
 			gboolean _tmp20_ = FALSE;
@@ -12996,7 +13001,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 				_g_object_unref0 (_tmp2_);
 #line 1590 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 12993 "BatchImport.c"
+#line 12998 "BatchImport.c"
 			}
 			{
 				BatchImportJob* _tmp21_ = NULL;
@@ -13012,7 +13017,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 				work_sniffer_search_dir (self, _tmp21_, _tmp22_, _tmp23_, &_inner_error_);
 #line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13009 "BatchImport.c"
+#line 13014 "BatchImport.c"
 					goto __catch415_g_error;
 				}
 			}
@@ -13059,7 +13064,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 				_g_free0 (_tmp28_);
 #line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_error_free0 (err);
-#line 13056 "BatchImport.c"
+#line 13061 "BatchImport.c"
 			}
 			__finally415:
 #line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -13076,7 +13081,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 				_g_object_unref0 (enumerator);
 #line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return;
-#line 13073 "BatchImport.c"
+#line 13078 "BatchImport.c"
 			}
 		} else {
 			GFileType _tmp33_ = 0;
@@ -13084,7 +13089,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 			_tmp33_ = file_type;
 #line 1598 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp33_ == G_FILE_TYPE_REGULAR) {
-#line 13081 "BatchImport.c"
+#line 13086 "BatchImport.c"
 				gboolean _tmp34_ = FALSE;
 				GeeHashSet* _tmp35_ = NULL;
 				gboolean _tmp39_ = FALSE;
@@ -13095,7 +13100,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 				_tmp35_ = self->priv->skipset;
 #line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_tmp35_ != NULL) {
-#line 13092 "BatchImport.c"
+#line 13097 "BatchImport.c"
 					GeeHashSet* _tmp36_ = NULL;
 					GFile* _tmp37_ = NULL;
 					gboolean _tmp38_ = FALSE;
@@ -13107,11 +13112,11 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 					_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"
 					_tmp34_ = _tmp38_;
-#line 13104 "BatchImport.c"
+#line 13109 "BatchImport.c"
 				} else {
 #line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp34_ = FALSE;
-#line 13108 "BatchImport.c"
+#line 13113 "BatchImport.c"
 				}
 #line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_tmp34_) {
@@ -13121,7 +13126,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 					_g_object_unref0 (_tmp2_);
 #line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					continue;
-#line 13118 "BatchImport.c"
+#line 13123 "BatchImport.c"
 				}
 #line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp41_ = child;
@@ -13129,7 +13134,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 				_tmp42_ = photo_is_file_image (_tmp41_);
 #line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_tmp42_) {
-#line 13126 "BatchImport.c"
+#line 13131 "BatchImport.c"
 					GFile* _tmp43_ = NULL;
 					gboolean _tmp44_ = FALSE;
 #line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -13138,17 +13143,17 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 					_tmp44_ = photo_file_format_is_file_supported (_tmp43_);
 #line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp40_ = _tmp44_;
-#line 13135 "BatchImport.c"
+#line 13140 "BatchImport.c"
 				} else {
 #line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp40_ = FALSE;
-#line 13139 "BatchImport.c"
+#line 13144 "BatchImport.c"
 				}
 #line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_tmp40_) {
 #line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp39_ = TRUE;
-#line 13145 "BatchImport.c"
+#line 13150 "BatchImport.c"
 				} else {
 					GFile* _tmp45_ = NULL;
 					gboolean _tmp46_ = FALSE;
@@ -13158,11 +13163,11 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 					_tmp46_ = video_reader_is_supported_video_file (_tmp45_);
 #line 1603 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp39_ = _tmp46_;
-#line 13155 "BatchImport.c"
+#line 13160 "BatchImport.c"
 				}
 #line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_tmp39_) {
-#line 13159 "BatchImport.c"
+#line 13164 "BatchImport.c"
 					guint64 _tmp47_ = 0ULL;
 					GFileInfo* _tmp48_ = NULL;
 					gint64 _tmp49_ = 0LL;
@@ -13202,7 +13207,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 					_g_object_unref0 (_tmp2_);
 #line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					continue;
-#line 13199 "BatchImport.c"
+#line 13204 "BatchImport.c"
 				}
 			} else {
 				GFile* _tmp56_ = NULL;
@@ -13221,20 +13226,20 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 				g_warning ("BatchImport.vala:1610: Ignoring import of %s file type %d", _tmp58_, (gint) _tmp59_);
 #line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp58_);
-#line 13218 "BatchImport.c"
+#line 13223 "BatchImport.c"
 			}
 		}
 #line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (child);
 #line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_tmp2_);
-#line 13225 "BatchImport.c"
+#line 13230 "BatchImport.c"
 	}
 #line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (info);
 #line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (enumerator);
-#line 13231 "BatchImport.c"
+#line 13236 "BatchImport.c"
 }
 
 
@@ -13246,8 +13251,8 @@ static void work_sniffer_class_init (WorkSnifferClass * klass) {
 #line 1436 "/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 = work_sniffer_real_execute;
-#line 13244 "BatchImport.c"
+	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) work_sniffer_real_execute;
+#line 13249 "BatchImport.c"
 }
 
 
@@ -13256,12 +13261,12 @@ static void work_sniffer_instance_init (WorkSniffer * self) {
 #line 1436 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv = WORK_SNIFFER_GET_PRIVATE (self);
 #line 1437 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = gee_array_list_new (TYPE_FILE_TO_PREPARE, (GBoxedCopyFunc) file_to_prepare_ref, file_to_prepare_unref, NULL, NULL, NULL);
+	_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"
 	self->files_to_prepare = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
 #line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->total_bytes = (guint64) 0;
-#line 13258 "BatchImport.c"
+#line 13263 "BatchImport.c"
 }
 
 
@@ -13277,7 +13282,7 @@ static void work_sniffer_finalize (BackgroundJob* obj) {
 	_g_object_unref0 (self->priv->skipset);
 #line 1436 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BACKGROUND_JOB_CLASS (work_sniffer_parent_class)->finalize (obj);
-#line 13274 "BatchImport.c"
+#line 13279 "BatchImport.c"
 }
 
 
@@ -13411,21 +13416,21 @@ PreparedFile* prepared_file_construct (GType object_type, BatchImportJob* job, G
 	self->is_video = _tmp19_;
 #line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 13408 "BatchImport.c"
+#line 13413 "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"
 	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 13415 "BatchImport.c"
+#line 13420 "BatchImport.c"
 }
 
 
 static void value_prepared_file_init (GValue* value) {
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 13422 "BatchImport.c"
+#line 13427 "BatchImport.c"
 }
 
 
@@ -13434,7 +13439,7 @@ static void value_prepared_file_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		prepared_file_unref (value->data[0].v_pointer);
-#line 13431 "BatchImport.c"
+#line 13436 "BatchImport.c"
 	}
 }
 
@@ -13444,11 +13449,11 @@ static void value_prepared_file_copy_value (const GValue* src_value, GValue* des
 	if (src_value->data[0].v_pointer) {
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = prepared_file_ref (src_value->data[0].v_pointer);
-#line 13441 "BatchImport.c"
+#line 13446 "BatchImport.c"
 	} else {
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 13445 "BatchImport.c"
+#line 13450 "BatchImport.c"
 	}
 }
 
@@ -13456,37 +13461,37 @@ static void value_prepared_file_copy_value (const GValue* src_value, GValue* des
 static gpointer value_prepared_file_peek_pointer (const GValue* value) {
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 13453 "BatchImport.c"
+#line 13458 "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"
 	if (collect_values[0].v_pointer) {
-#line 13460 "BatchImport.c"
+#line 13465 "BatchImport.c"
 		PreparedFile* object;
 		object = collect_values[0].v_pointer;
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 13467 "BatchImport.c"
+#line 13472 "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"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 13471 "BatchImport.c"
+#line 13476 "BatchImport.c"
 		}
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = prepared_file_ref (object);
-#line 13475 "BatchImport.c"
+#line 13480 "BatchImport.c"
 	} else {
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 13479 "BatchImport.c"
+#line 13484 "BatchImport.c"
 	}
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 13483 "BatchImport.c"
+#line 13488 "BatchImport.c"
 }
 
 
@@ -13497,25 +13502,25 @@ static gchar* value_prepared_file_lcopy_value (const GValue* value, guint n_coll
 	if (!object_p) {
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 13494 "BatchImport.c"
+#line 13499 "BatchImport.c"
 	}
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 13500 "BatchImport.c"
+#line 13505 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 13504 "BatchImport.c"
+#line 13509 "BatchImport.c"
 	} else {
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = prepared_file_ref (value->data[0].v_pointer);
-#line 13508 "BatchImport.c"
+#line 13513 "BatchImport.c"
 	}
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 13512 "BatchImport.c"
+#line 13517 "BatchImport.c"
 }
 
 
@@ -13529,7 +13534,7 @@ GParamSpec* param_spec_prepared_file (const gchar* name, const gchar* nick, cons
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 13526 "BatchImport.c"
+#line 13531 "BatchImport.c"
 }
 
 
@@ -13538,7 +13543,7 @@ gpointer value_get_prepared_file (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREPARED_FILE), NULL);
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 13535 "BatchImport.c"
+#line 13540 "BatchImport.c"
 }
 
 
@@ -13558,17 +13563,17 @@ void value_set_prepared_file (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		prepared_file_ref (value->data[0].v_pointer);
-#line 13555 "BatchImport.c"
+#line 13560 "BatchImport.c"
 	} else {
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 13559 "BatchImport.c"
+#line 13564 "BatchImport.c"
 	}
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		prepared_file_unref (old);
-#line 13565 "BatchImport.c"
+#line 13570 "BatchImport.c"
 	}
 }
 
@@ -13587,17 +13592,17 @@ void value_take_prepared_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 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 13584 "BatchImport.c"
+#line 13589 "BatchImport.c"
 	} else {
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 13588 "BatchImport.c"
+#line 13593 "BatchImport.c"
 	}
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		prepared_file_unref (old);
-#line 13594 "BatchImport.c"
+#line 13599 "BatchImport.c"
 	}
 }
 
@@ -13607,7 +13612,7 @@ static void prepared_file_class_init (PreparedFileClass * klass) {
 	prepared_file_parent_class = g_type_class_peek_parent (klass);
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((PreparedFileClass *) klass)->finalize = prepared_file_finalize;
-#line 13604 "BatchImport.c"
+#line 13609 "BatchImport.c"
 }
 
 
@@ -13616,7 +13621,7 @@ static void prepared_file_instance_init (PreparedFile * self) {
 	self->associated_file = NULL;
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 13613 "BatchImport.c"
+#line 13618 "BatchImport.c"
 }
 
 
@@ -13642,7 +13647,7 @@ static void prepared_file_finalize (PreparedFile* obj) {
 	_g_free0 (self->thumbnail_md5);
 #line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->full_md5);
-#line 13639 "BatchImport.c"
+#line 13644 "BatchImport.c"
 }
 
 
@@ -13667,7 +13672,7 @@ gpointer prepared_file_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 13664 "BatchImport.c"
+#line 13669 "BatchImport.c"
 }
 
 
@@ -13680,7 +13685,7 @@ void prepared_file_unref (gpointer instance) {
 		PREPARED_FILE_GET_CLASS (self)->finalize (self);
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 13677 "BatchImport.c"
+#line 13682 "BatchImport.c"
 	}
 }
 
@@ -13703,14 +13708,14 @@ PreparedFileCluster* prepared_file_cluster_construct (GType object_type, GeeArra
 	self->list = _tmp1_;
 #line 1653 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 13700 "BatchImport.c"
+#line 13705 "BatchImport.c"
 }
 
 
 PreparedFileCluster* prepared_file_cluster_new (GeeArrayList* list) {
 #line 1653 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return prepared_file_cluster_construct (TYPE_PREPARED_FILE_CLUSTER, list);
-#line 13707 "BatchImport.c"
+#line 13712 "BatchImport.c"
 }
 
 
@@ -13719,7 +13724,7 @@ static void prepared_file_cluster_class_init (PreparedFileClusterClass * klass)
 	prepared_file_cluster_parent_class = g_type_class_peek_parent (klass);
 #line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((NotificationObjectClass *) klass)->finalize = prepared_file_cluster_finalize;
-#line 13716 "BatchImport.c"
+#line 13721 "BatchImport.c"
 }
 
 
@@ -13735,7 +13740,7 @@ static void prepared_file_cluster_finalize (NotificationObject* obj) {
 	_g_object_unref0 (self->list);
 #line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	NOTIFICATION_OBJECT_CLASS (prepared_file_cluster_parent_class)->finalize (obj);
-#line 13732 "BatchImport.c"
+#line 13737 "BatchImport.c"
 }
 
 
@@ -13820,14 +13825,14 @@ PrepareFilesJob* prepare_files_job_construct (GType object_type, BatchImport* ow
 	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"
 	return self;
-#line 13817 "BatchImport.c"
+#line 13822 "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"
 	return prepare_files_job_construct (TYPE_PREPARE_FILES_JOB, owner, files_to_prepare, notification, notification_target, callback, callback_target, cancellable, cancellation, cancellation_target);
-#line 13824 "BatchImport.c"
+#line 13829 "BatchImport.c"
 }
 
 
@@ -13856,7 +13861,7 @@ static gint prepare_files_job_get_test_variable (const gchar* name) {
 	if (_tmp5_ == NULL) {
 #line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = TRUE;
-#line 13853 "BatchImport.c"
+#line 13858 "BatchImport.c"
 	} else {
 		const gchar* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
@@ -13869,13 +13874,13 @@ static gint prepare_files_job_get_test_variable (const gchar* name) {
 		_tmp8_ = _tmp7_;
 #line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = _tmp8_ == 0;
-#line 13866 "BatchImport.c"
+#line 13871 "BatchImport.c"
 	}
 #line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp4_) {
 #line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = 0;
-#line 13872 "BatchImport.c"
+#line 13877 "BatchImport.c"
 	} else {
 		const gchar* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
@@ -13885,7 +13890,7 @@ static gint prepare_files_job_get_test_variable (const gchar* name) {
 		_tmp10_ = atoi (_tmp9_);
 #line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = _tmp10_;
-#line 13882 "BatchImport.c"
+#line 13887 "BatchImport.c"
 	}
 #line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp3_;
@@ -13893,7 +13898,7 @@ static gint prepare_files_job_get_test_variable (const gchar* name) {
 	_g_free0 (value);
 #line 1688 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 13890 "BatchImport.c"
+#line 13895 "BatchImport.c"
 }
 
 
@@ -13913,10 +13918,10 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 #line 1692 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	timer = _tmp0_;
 #line 1694 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = gee_array_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, prepared_file_unref, NULL, NULL, NULL);
+	_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"
 	list = _tmp1_;
-#line 13913 "BatchImport.c"
+#line 13918 "BatchImport.c"
 	{
 		GeeList* _file_to_prepare_list = NULL;
 		GeeList* _tmp2_ = NULL;
@@ -13944,7 +13949,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 		_file_to_prepare_index = -1;
 #line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 13941 "BatchImport.c"
+#line 13946 "BatchImport.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -13998,7 +14003,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 			if (!(_tmp8_ < _tmp9_)) {
 #line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 13995 "BatchImport.c"
+#line 14000 "BatchImport.c"
 			}
 #line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp10_ = _file_to_prepare_list;
@@ -14016,7 +14021,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 			_tmp14_ = _result_;
 #line 1697 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp14_ != IMPORT_RESULT_SUCCESS) {
-#line 14013 "BatchImport.c"
+#line 14018 "BatchImport.c"
 				FileToPrepare* _tmp15_ = NULL;
 				BatchImportJob* _tmp16_ = NULL;
 				FileToPrepare* _tmp17_ = NULL;
@@ -14060,7 +14065,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 				_file_to_prepare_unref0 (file_to_prepare);
 #line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 14057 "BatchImport.c"
+#line 14062 "BatchImport.c"
 			}
 #line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp26_ = file_to_prepare;
@@ -14084,7 +14089,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 			_tmp34_ = _tmp33_->associated;
 #line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp34_ != NULL) {
-#line 14081 "BatchImport.c"
+#line 14086 "BatchImport.c"
 				FileToPrepare* _tmp35_ = NULL;
 				FileToPrepare* _tmp36_ = NULL;
 				GFile* _tmp37_ = NULL;
@@ -14096,11 +14101,11 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 				_tmp37_ = _tmp36_->file;
 #line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp32_ = _tmp37_;
-#line 14093 "BatchImport.c"
+#line 14098 "BatchImport.c"
 			} else {
 #line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp32_ = NULL;
-#line 14097 "BatchImport.c"
+#line 14102 "BatchImport.c"
 			}
 #line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp38_ = _g_object_ref0 (_tmp32_);
@@ -14116,7 +14121,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 			_tmp41_ = file;
 #line 1710 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp41_ == NULL) {
-#line 14113 "BatchImport.c"
+#line 14118 "BatchImport.c"
 				BatchImportJob* _tmp42_ = NULL;
 				GFile* _tmp43_ = NULL;
 				gboolean _tmp44_ = FALSE;
@@ -14143,14 +14148,14 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 					_file_to_prepare_unref0 (file_to_prepare);
 #line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					continue;
-#line 14140 "BatchImport.c"
+#line 14145 "BatchImport.c"
 				}
 			}
 #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp47_ = associated;
 #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp47_ == NULL) {
-#line 14147 "BatchImport.c"
+#line 14152 "BatchImport.c"
 				FileToPrepare* _tmp48_ = NULL;
 				FileToPrepare* _tmp49_ = NULL;
 #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14159,15 +14164,15 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 				_tmp49_ = _tmp48_->associated;
 #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp46_ = _tmp49_ != NULL;
-#line 14156 "BatchImport.c"
+#line 14161 "BatchImport.c"
 			} else {
 #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp46_ = FALSE;
-#line 14160 "BatchImport.c"
+#line 14165 "BatchImport.c"
 			}
 #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp46_) {
-#line 14164 "BatchImport.c"
+#line 14169 "BatchImport.c"
 				FileToPrepare* _tmp50_ = NULL;
 				FileToPrepare* _tmp51_ = NULL;
 				BatchImportJob* _tmp52_ = NULL;
@@ -14187,7 +14192,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 				associated = _tmp53_;
 #line 1716 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				copy_to_library = _tmp54_;
-#line 14184 "BatchImport.c"
+#line 14189 "BatchImport.c"
 			}
 #line 1720 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp55_ = job;
@@ -14209,7 +14214,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 			_tmp61_ = _result_;
 #line 1721 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp61_ == IMPORT_RESULT_SUCCESS) {
-#line 14206 "BatchImport.c"
+#line 14211 "BatchImport.c"
 				gint _tmp62_ = 0;
 				GeeArrayList* _tmp63_ = NULL;
 				PreparedFile* _tmp64_ = NULL;
@@ -14223,7 +14228,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 				_tmp64_ = prepared_file;
 #line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp64_);
-#line 14220 "BatchImport.c"
+#line 14225 "BatchImport.c"
 			} else {
 				BatchImportJob* _tmp65_ = NULL;
 				GFile* _tmp66_ = NULL;
@@ -14258,19 +14263,19 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 				_g_free0 (_tmp72_);
 #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp69_);
-#line 14255 "BatchImport.c"
+#line 14260 "BatchImport.c"
 			}
 #line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp75_ = list;
 #line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp76_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_COLLECTION, GeeCollection));
+			_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"
 			_tmp77_ = _tmp76_;
 #line 1729 "/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"
 				_tmp74_ = TRUE;
-#line 14267 "BatchImport.c"
+#line 14272 "BatchImport.c"
 			} else {
 				gboolean _tmp78_ = FALSE;
 				GTimer* _tmp79_ = NULL;
@@ -14281,31 +14286,31 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 				_tmp80_ = g_timer_elapsed (_tmp79_, NULL);
 #line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if ((_tmp80_ * 1000.0) > ((gdouble) BATCH_IMPORT_REPORT_PREPARED_FILES_EVERY_N_MSEC)) {
-#line 14278 "BatchImport.c"
+#line 14283 "BatchImport.c"
 					GeeArrayList* _tmp81_ = NULL;
 					gint _tmp82_ = 0;
 					gint _tmp83_ = 0;
 #line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp81_ = list;
 #line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp82_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GEE_TYPE_COLLECTION, GeeCollection));
+					_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"
 					_tmp83_ = _tmp82_;
 #line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp78_ = _tmp83_ > 0;
-#line 14290 "BatchImport.c"
+#line 14295 "BatchImport.c"
 				} else {
 #line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp78_ = FALSE;
-#line 14294 "BatchImport.c"
+#line 14299 "BatchImport.c"
 				}
 #line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp74_ = _tmp78_;
-#line 14298 "BatchImport.c"
+#line 14303 "BatchImport.c"
 			}
 #line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp74_) {
-#line 14302 "BatchImport.c"
+#line 14307 "BatchImport.c"
 				PreparedFileCluster* cluster = NULL;
 				GeeArrayList* _tmp84_ = NULL;
 				PreparedFileCluster* _tmp85_ = NULL;
@@ -14321,7 +14326,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 #line 1734 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				cluster = _tmp85_;
 #line 1735 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp86_ = gee_array_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, prepared_file_unref, NULL, NULL, NULL);
+				_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"
 				_g_object_unref0 (list);
 #line 1735 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14340,7 +14345,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 				g_timer_start (_tmp89_);
 #line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_notification_object_unref0 (cluster);
-#line 14337 "BatchImport.c"
+#line 14342 "BatchImport.c"
 			}
 #line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (prepared_file);
@@ -14352,21 +14357,21 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 			_batch_import_job_unref0 (job);
 #line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_file_to_prepare_unref0 (file_to_prepare);
-#line 14349 "BatchImport.c"
+#line 14354 "BatchImport.c"
 		}
 #line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_file_to_prepare_list);
-#line 14353 "BatchImport.c"
+#line 14358 "BatchImport.c"
 	}
 #line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp90_ = list;
 #line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp91_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GEE_TYPE_COLLECTION, GeeCollection));
+	_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"
 	_tmp92_ = _tmp91_;
 #line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp92_ > 0) {
-#line 14363 "BatchImport.c"
+#line 14368 "BatchImport.c"
 		ImportResult _result_ = 0;
 		ImportResult _tmp93_ = 0;
 		ImportResult _tmp94_ = 0;
@@ -14378,7 +14383,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 		_tmp94_ = _result_;
 #line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp94_ == IMPORT_RESULT_SUCCESS) {
-#line 14375 "BatchImport.c"
+#line 14380 "BatchImport.c"
 			NotificationCallback _tmp95_ = NULL;
 			void* _tmp95__target = NULL;
 			GeeArrayList* _tmp96_ = NULL;
@@ -14398,7 +14403,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 			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"
 			_notification_object_unref0 (_tmp98_);
-#line 14395 "BatchImport.c"
+#line 14400 "BatchImport.c"
 		} else {
 			gint _tmp99_ = 0;
 			GeeArrayList* _tmp100_ = NULL;
@@ -14413,7 +14418,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 #line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp100_ = list;
 #line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp101_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_COLLECTION, GeeCollection));
+			_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"
 			_tmp102_ = _tmp101_;
 #line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14423,12 +14428,12 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 #line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp104_ = list;
 #line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp105_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, GEE_TYPE_COLLECTION, GeeCollection));
+			_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"
 			_tmp106_ = _tmp105_;
 #line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			self->prepared_files = _tmp103_ - _tmp106_;
-#line 14425 "BatchImport.c"
+#line 14430 "BatchImport.c"
 			{
 				GeeArrayList* _prepared_file_list = NULL;
 				GeeArrayList* _tmp107_ = NULL;
@@ -14447,7 +14452,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 #line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp109_ = _prepared_file_list;
 #line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp110_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, GEE_TYPE_COLLECTION, GeeCollection));
+				_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"
 				_tmp111_ = _tmp110_;
 #line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14456,7 +14461,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 				_prepared_file_index = -1;
 #line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				while (TRUE) {
-#line 14453 "BatchImport.c"
+#line 14458 "BatchImport.c"
 					gint _tmp112_ = 0;
 					gint _tmp113_ = 0;
 					gint _tmp114_ = 0;
@@ -14489,7 +14494,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 					if (!(_tmp113_ < _tmp114_)) {
 #line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						break;
-#line 14486 "BatchImport.c"
+#line 14491 "BatchImport.c"
 					}
 #line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp115_ = _prepared_file_list;
@@ -14533,11 +14538,11 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 					_g_free0 (_tmp125_);
 #line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_prepared_file_unref0 (prepared_file);
-#line 14530 "BatchImport.c"
+#line 14535 "BatchImport.c"
 				}
 #line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_prepared_file_list);
-#line 14534 "BatchImport.c"
+#line 14539 "BatchImport.c"
 			}
 		}
 	}
@@ -14545,7 +14550,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 	_g_object_unref0 (list);
 #line 1691 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_timer_destroy0 (timer);
-#line 14542 "BatchImport.c"
+#line 14547 "BatchImport.c"
 }
 
 
@@ -14558,7 +14563,7 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
 	g_return_val_if_fail (IS_PREPARE_FILES_JOB (self), FALSE);
 #line 1760 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), FALSE);
-#line 14555 "BatchImport.c"
+#line 14560 "BatchImport.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		BatchImportJob* _tmp1_ = NULL;
@@ -14579,12 +14584,12 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
 		_tmp0_ = _tmp4_;
 #line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14576 "BatchImport.c"
+#line 14581 "BatchImport.c"
 			goto __catch416_g_error;
 		}
 #line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!_tmp0_) {
-#line 14581 "BatchImport.c"
+#line 14586 "BatchImport.c"
 			BatchImportJob* _tmp5_ = NULL;
 			BatchImportJob* _tmp6_ = NULL;
 			gchar* _tmp7_ = NULL;
@@ -14618,21 +14623,21 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
 			if (file) {
 #line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				*file = _vala_file;
-#line 14615 "BatchImport.c"
+#line 14620 "BatchImport.c"
 			} else {
 #line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_vala_file);
-#line 14619 "BatchImport.c"
+#line 14624 "BatchImport.c"
 			}
 #line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (copy_to_library) {
 #line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				*copy_to_library = _vala_copy_to_library;
-#line 14625 "BatchImport.c"
+#line 14630 "BatchImport.c"
 			}
 #line 1766 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 14629 "BatchImport.c"
+#line 14634 "BatchImport.c"
 		}
 	}
 	goto __finally416;
@@ -14681,32 +14686,34 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
 		if (file) {
 #line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*file = _vala_file;
-#line 14678 "BatchImport.c"
+#line 14683 "BatchImport.c"
 		} else {
 #line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_vala_file);
-#line 14682 "BatchImport.c"
+#line 14687 "BatchImport.c"
 		}
 #line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (copy_to_library) {
 #line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*copy_to_library = _vala_copy_to_library;
-#line 14688 "BatchImport.c"
+#line 14693 "BatchImport.c"
 		}
 #line 1772 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 14692 "BatchImport.c"
+#line 14697 "BatchImport.c"
 	}
 	__finally416:
 #line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 14702 "BatchImport.c"
+		gboolean _tmp20_ = FALSE;
 #line 1761 "/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"
 		g_clear_error (&_inner_error_);
 #line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		return FALSE;
-#line 14703 "BatchImport.c"
+		return _tmp20_;
+#line 14710 "BatchImport.c"
 	}
 #line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = TRUE;
@@ -14714,21 +14721,21 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
 	if (file) {
 #line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*file = _vala_file;
-#line 14711 "BatchImport.c"
+#line 14718 "BatchImport.c"
 	} else {
 #line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_vala_file);
-#line 14715 "BatchImport.c"
+#line 14722 "BatchImport.c"
 	}
 #line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (copy_to_library) {
 #line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*copy_to_library = _vala_copy_to_library;
-#line 14721 "BatchImport.c"
+#line 14728 "BatchImport.c"
 	}
 #line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 14725 "BatchImport.c"
+#line 14732 "BatchImport.c"
 }
 
 
@@ -14798,7 +14805,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 	_tmp3_ = is_video;
 #line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!_tmp3_) {
-#line 14795 "BatchImport.c"
+#line 14802 "BatchImport.c"
 		GFile* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 #line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14807,11 +14814,11 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		_tmp5_ = photo_is_file_image (_tmp4_);
 #line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = !_tmp5_;
-#line 14804 "BatchImport.c"
+#line 14811 "BatchImport.c"
 	} else {
 #line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = FALSE;
-#line 14808 "BatchImport.c"
+#line 14815 "BatchImport.c"
 	}
 #line 1783 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp2_) {
@@ -14821,21 +14828,21 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		if (prepared_file) {
 #line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*prepared_file = _vala_prepared_file;
-#line 14818 "BatchImport.c"
+#line 14825 "BatchImport.c"
 		} else {
 #line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (_vala_prepared_file);
-#line 14822 "BatchImport.c"
+#line 14829 "BatchImport.c"
 		}
 #line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 14826 "BatchImport.c"
+#line 14833 "BatchImport.c"
 	}
 #line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = is_video;
 #line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!_tmp7_) {
-#line 14832 "BatchImport.c"
+#line 14839 "BatchImport.c"
 		GFile* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 #line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14844,11 +14851,11 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		_tmp9_ = photo_file_format_is_file_supported (_tmp8_);
 #line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = !_tmp9_;
-#line 14841 "BatchImport.c"
+#line 14848 "BatchImport.c"
 	} else {
 #line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = FALSE;
-#line 14845 "BatchImport.c"
+#line 14852 "BatchImport.c"
 	}
 #line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp6_) {
@@ -14858,15 +14865,15 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		if (prepared_file) {
 #line 1787 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*prepared_file = _vala_prepared_file;
-#line 14855 "BatchImport.c"
+#line 14862 "BatchImport.c"
 		} else {
 #line 1787 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (_vala_prepared_file);
-#line 14859 "BatchImport.c"
+#line 14866 "BatchImport.c"
 		}
 #line 1787 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 14863 "BatchImport.c"
+#line 14870 "BatchImport.c"
 	}
 #line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = self->priv->import_file_count;
@@ -14876,7 +14883,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 	_tmp11_ = self->priv->fail_every;
 #line 1792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp11_ > 0) {
-#line 14873 "BatchImport.c"
+#line 14880 "BatchImport.c"
 		gint _tmp12_ = 0;
 		gint _tmp13_ = 0;
 #line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14891,22 +14898,22 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 			if (prepared_file) {
 #line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				*prepared_file = _vala_prepared_file;
-#line 14888 "BatchImport.c"
+#line 14895 "BatchImport.c"
 			} else {
 #line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_unref0 (_vala_prepared_file);
-#line 14892 "BatchImport.c"
+#line 14899 "BatchImport.c"
 			}
 #line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 14896 "BatchImport.c"
+#line 14903 "BatchImport.c"
 		}
 	}
 #line 1798 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp14_ = self->priv->skip_every;
 #line 1798 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp14_ > 0) {
-#line 14903 "BatchImport.c"
+#line 14910 "BatchImport.c"
 		gint _tmp15_ = 0;
 		gint _tmp16_ = 0;
 #line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14921,15 +14928,15 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 			if (prepared_file) {
 #line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				*prepared_file = _vala_prepared_file;
-#line 14918 "BatchImport.c"
+#line 14925 "BatchImport.c"
 			} else {
 #line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_unref0 (_vala_prepared_file);
-#line 14922 "BatchImport.c"
+#line 14929 "BatchImport.c"
 			}
 #line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 14926 "BatchImport.c"
+#line 14933 "BatchImport.c"
 		}
 	}
 #line 1803 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14938,7 +14945,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 	thumbnail_md5 = NULL;
 #line 1805 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	full_md5 = NULL;
-#line 14935 "BatchImport.c"
+#line 14942 "BatchImport.c"
 	{
 		gchar* _tmp17_ = NULL;
 		GFile* _tmp18_ = NULL;
@@ -14952,7 +14959,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		_tmp17_ = _tmp19_;
 #line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14949 "BatchImport.c"
+#line 14956 "BatchImport.c"
 			goto __catch417_g_error;
 		}
 #line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14965,7 +14972,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		full_md5 = _tmp20_;
 #line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp17_);
-#line 14962 "BatchImport.c"
+#line 14969 "BatchImport.c"
 	}
 	goto __finally417;
 	__catch417_g_error:
@@ -15014,15 +15021,15 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		if (prepared_file) {
 #line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*prepared_file = _vala_prepared_file;
-#line 15011 "BatchImport.c"
+#line 15018 "BatchImport.c"
 		} else {
 #line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (_vala_prepared_file);
-#line 15015 "BatchImport.c"
+#line 15022 "BatchImport.c"
 		}
 #line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 15019 "BatchImport.c"
+#line 15026 "BatchImport.c"
 	}
 	__finally417:
 #line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15039,7 +15046,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		g_clear_error (&_inner_error_);
 #line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return 0;
-#line 15036 "BatchImport.c"
+#line 15043 "BatchImport.c"
 	}
 #line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp28_ = file;
@@ -15051,7 +15058,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 	_tmp30_ = is_video;
 #line 1822 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!_tmp30_) {
-#line 15048 "BatchImport.c"
+#line 15055 "BatchImport.c"
 		PhotoFileFormat _tmp31_ = 0;
 		PhotoFileReader* reader = NULL;
 		PhotoFileFormat _tmp35_ = 0;
@@ -15066,7 +15073,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		_tmp31_ = file_format;
 #line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp31_ == PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 15063 "BatchImport.c"
+#line 15070 "BatchImport.c"
 			GFile* _tmp32_ = NULL;
 			gchar* _tmp33_ = NULL;
 			gchar* _tmp34_ = NULL;
@@ -15092,15 +15099,15 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 			if (prepared_file) {
 #line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				*prepared_file = _vala_prepared_file;
-#line 15089 "BatchImport.c"
+#line 15096 "BatchImport.c"
 			} else {
 #line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_unref0 (_vala_prepared_file);
-#line 15093 "BatchImport.c"
+#line 15100 "BatchImport.c"
 			}
 #line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 15097 "BatchImport.c"
+#line 15104 "BatchImport.c"
 		}
 #line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp35_ = file_format;
@@ -15120,7 +15127,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		reader = _tmp40_;
 #line 1829 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		metadata = NULL;
-#line 15117 "BatchImport.c"
+#line 15124 "BatchImport.c"
 		{
 			PhotoMetadata* _tmp41_ = NULL;
 			PhotoFileReader* _tmp42_ = NULL;
@@ -15134,7 +15141,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 			_tmp41_ = _tmp43_;
 #line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15131 "BatchImport.c"
+#line 15138 "BatchImport.c"
 				goto __catch418_g_error;
 			}
 #line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15147,7 +15154,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 			metadata = _tmp44_;
 #line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_media_metadata_unref0 (_tmp41_);
-#line 15144 "BatchImport.c"
+#line 15151 "BatchImport.c"
 		}
 		goto __finally418;
 		__catch418_g_error:
@@ -15179,7 +15186,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 			_g_free0 (_tmp47_);
 #line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (err);
-#line 15175 "BatchImport.c"
+#line 15182 "BatchImport.c"
 		}
 		__finally418:
 #line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15200,13 +15207,13 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 			g_clear_error (&_inner_error_);
 #line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return 0;
-#line 15196 "BatchImport.c"
+#line 15203 "BatchImport.c"
 		}
 #line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp50_ = metadata;
 #line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp50_ != NULL) {
-#line 15202 "BatchImport.c"
+#line 15209 "BatchImport.c"
 			guint8* flattened_sans_thumbnail = NULL;
 			PhotoMetadata* _tmp51_ = NULL;
 			gint _tmp52_ = 0;
@@ -15241,7 +15248,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 			_tmp55__length1 = flattened_sans_thumbnail_length1;
 #line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp55_ != NULL) {
-#line 15237 "BatchImport.c"
+#line 15244 "BatchImport.c"
 				guint8* _tmp56_ = NULL;
 				gint _tmp56__length1 = 0;
 #line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15250,15 +15257,15 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 				_tmp56__length1 = flattened_sans_thumbnail_length1;
 #line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp54_ = _tmp56__length1 > 0;
-#line 15246 "BatchImport.c"
+#line 15253 "BatchImport.c"
 			} else {
 #line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp54_ = FALSE;
-#line 15250 "BatchImport.c"
+#line 15257 "BatchImport.c"
 			}
 #line 1839 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp54_) {
-#line 15254 "BatchImport.c"
+#line 15261 "BatchImport.c"
 				guint8* _tmp57_ = NULL;
 				gint _tmp57__length1 = 0;
 				guint8* _tmp58_ = NULL;
@@ -15278,7 +15285,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 				_g_free0 (exif_only_md5);
 #line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				exif_only_md5 = _tmp59_;
-#line 15274 "BatchImport.c"
+#line 15281 "BatchImport.c"
 			}
 #line 1842 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp60_ = metadata;
@@ -15296,7 +15303,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 			_tmp64__length1 = flattened_thumbnail_length1;
 #line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp64_ != NULL) {
-#line 15292 "BatchImport.c"
+#line 15299 "BatchImport.c"
 				guint8* _tmp65_ = NULL;
 				gint _tmp65__length1 = 0;
 #line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15305,15 +15312,15 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 				_tmp65__length1 = flattened_thumbnail_length1;
 #line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp63_ = _tmp65__length1 > 0;
-#line 15301 "BatchImport.c"
+#line 15308 "BatchImport.c"
 			} else {
 #line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp63_ = FALSE;
-#line 15305 "BatchImport.c"
+#line 15312 "BatchImport.c"
 			}
 #line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp63_) {
-#line 15309 "BatchImport.c"
+#line 15316 "BatchImport.c"
 				guint8* _tmp66_ = NULL;
 				gint _tmp66__length1 = 0;
 				guint8* _tmp67_ = NULL;
@@ -15333,23 +15340,23 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 				_g_free0 (thumbnail_md5);
 #line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				thumbnail_md5 = _tmp68_;
-#line 15329 "BatchImport.c"
+#line 15336 "BatchImport.c"
 			}
 #line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			flattened_thumbnail = (g_free (flattened_thumbnail), NULL);
 #line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL);
-#line 15335 "BatchImport.c"
+#line 15342 "BatchImport.c"
 		}
 #line 1822 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_media_metadata_unref0 (metadata);
 #line 1822 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 15341 "BatchImport.c"
+#line 15348 "BatchImport.c"
 	}
 #line 1848 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	filesize = (guint64) 0;
-#line 15345 "BatchImport.c"
+#line 15352 "BatchImport.c"
 	{
 		guint64 _tmp69_ = 0ULL;
 		GFile* _tmp70_ = NULL;
@@ -15373,12 +15380,12 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		_tmp69_ = _tmp74_;
 #line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15369 "BatchImport.c"
+#line 15376 "BatchImport.c"
 			goto __catch419_g_error;
 		}
 #line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		filesize = _tmp69_;
-#line 15374 "BatchImport.c"
+#line 15381 "BatchImport.c"
 	}
 	goto __finally419;
 	__catch419_g_error:
@@ -15427,15 +15434,15 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		if (prepared_file) {
 #line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*prepared_file = _vala_prepared_file;
-#line 15423 "BatchImport.c"
+#line 15430 "BatchImport.c"
 		} else {
 #line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (_vala_prepared_file);
-#line 15427 "BatchImport.c"
+#line 15434 "BatchImport.c"
 		}
 #line 1854 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 15431 "BatchImport.c"
+#line 15438 "BatchImport.c"
 	}
 	__finally419:
 #line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15452,7 +15459,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		g_clear_error (&_inner_error_);
 #line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return 0;
-#line 15448 "BatchImport.c"
+#line 15455 "BatchImport.c"
 	}
 #line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp82_ = file;
@@ -15466,17 +15473,17 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 	_tmp86_ = copy_to_library;
 #line 1862 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp86_) {
-#line 15462 "BatchImport.c"
+#line 15469 "BatchImport.c"
 		gboolean _tmp87_ = FALSE;
 #line 1862 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp87_ = is_in_library_dir;
 #line 1862 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp85_ = !_tmp87_;
-#line 15468 "BatchImport.c"
+#line 15475 "BatchImport.c"
 	} else {
 #line 1862 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp85_ = FALSE;
-#line 15472 "BatchImport.c"
+#line 15479 "BatchImport.c"
 	}
 #line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp88_ = job;
@@ -15530,15 +15537,15 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 	if (prepared_file) {
 #line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*prepared_file = _vala_prepared_file;
-#line 15526 "BatchImport.c"
+#line 15533 "BatchImport.c"
 	} else {
 #line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_prepared_file_unref0 (_vala_prepared_file);
-#line 15530 "BatchImport.c"
+#line 15537 "BatchImport.c"
 	}
 #line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 15534 "BatchImport.c"
+#line 15541 "BatchImport.c"
 }
 
 
@@ -15550,8 +15557,8 @@ static void prepare_files_job_class_init (PrepareFilesJobClass * klass) {
 #line 1658 "/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 = prepare_files_job_real_execute;
-#line 15547 "BatchImport.c"
+	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) prepare_files_job_real_execute;
+#line 15554 "BatchImport.c"
 }
 
 
@@ -15566,7 +15573,7 @@ static void prepare_files_job_instance_init (PrepareFilesJob * self) {
 	self->priv->fail_every = 0;
 #line 1669 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->skip_every = 0;
-#line 15562 "BatchImport.c"
+#line 15569 "BatchImport.c"
 }
 
 
@@ -15580,7 +15587,7 @@ static void prepare_files_job_finalize (BackgroundJob* obj) {
 	_g_object_unref0 (self->priv->library_dir);
 #line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BACKGROUND_JOB_CLASS (prepare_files_job_parent_class)->finalize (obj);
-#line 15576 "BatchImport.c"
+#line 15583 "BatchImport.c"
 }
 
 
@@ -15599,28 +15606,28 @@ GType prepare_files_job_get_type (void) {
 static gpointer _prepared_file_ref0 (gpointer self) {
 #line 1886 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? prepared_file_ref (self) : NULL;
-#line 15595 "BatchImport.c"
+#line 15602 "BatchImport.c"
 }
 
 
 static gpointer _batch_import_result_ref0 (gpointer self) {
 #line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? batch_import_result_ref (self) : NULL;
-#line 15602 "BatchImport.c"
+#line 15609 "BatchImport.c"
 }
 
 
 static gpointer _video_import_params_ref0 (gpointer self) {
 #line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? video_import_params_ref (self) : NULL;
-#line 15609 "BatchImport.c"
+#line 15616 "BatchImport.c"
 }
 
 
 static gpointer _photo_import_params_ref0 (gpointer self) {
 #line 1889 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? photo_import_params_ref (self) : NULL;
-#line 15616 "BatchImport.c"
+#line 15623 "BatchImport.c"
 }
 
 
@@ -15658,28 +15665,28 @@ ReadyForImport* ready_for_import_construct (GType object_type, GFile* final_file
 	_tmp1_ = _tmp0_->is_video;
 #line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_) {
-#line 15654 "BatchImport.c"
+#line 15661 "BatchImport.c"
 		gboolean _tmp2_ = FALSE;
 		VideoImportParams* _tmp3_ = NULL;
 #line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = video_import_params;
 #line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp3_ != NULL) {
-#line 15661 "BatchImport.c"
+#line 15668 "BatchImport.c"
 			PhotoImportParams* _tmp4_ = NULL;
 #line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp4_ = photo_import_params;
 #line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp2_ = _tmp4_ == NULL;
-#line 15667 "BatchImport.c"
+#line 15674 "BatchImport.c"
 		} else {
 #line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp2_ = FALSE;
-#line 15671 "BatchImport.c"
+#line 15678 "BatchImport.c"
 		}
 #line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_vala_assert (_tmp2_, "(video_import_params != null) && (photo_import_params == null)");
-#line 15675 "BatchImport.c"
+#line 15682 "BatchImport.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		VideoImportParams* _tmp6_ = NULL;
@@ -15687,21 +15694,21 @@ ReadyForImport* ready_for_import_construct (GType object_type, GFile* final_file
 		_tmp6_ = video_import_params;
 #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp6_ == NULL) {
-#line 15683 "BatchImport.c"
+#line 15690 "BatchImport.c"
 			PhotoImportParams* _tmp7_ = NULL;
 #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp7_ = photo_import_params;
 #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp5_ = _tmp7_ != NULL;
-#line 15689 "BatchImport.c"
+#line 15696 "BatchImport.c"
 		} else {
 #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp5_ = FALSE;
-#line 15693 "BatchImport.c"
+#line 15700 "BatchImport.c"
 		}
 #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_vala_assert (_tmp5_, "(video_import_params == null) && (photo_import_params != null)");
-#line 15697 "BatchImport.c"
+#line 15704 "BatchImport.c"
 	}
 #line 1885 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = final_file;
@@ -15751,14 +15758,14 @@ ReadyForImport* ready_for_import_construct (GType object_type, GFile* final_file
 	self->is_video = _tmp19_;
 #line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 15747 "BatchImport.c"
+#line 15754 "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"
 	return ready_for_import_construct (TYPE_READY_FOR_IMPORT, final_file, prepared_file, photo_import_params, video_import_params, batch_result);
-#line 15754 "BatchImport.c"
+#line 15761 "BatchImport.c"
 }
 
 
@@ -15788,7 +15795,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 	_tmp1_ = self->final_file;
 #line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 15784 "BatchImport.c"
+#line 15791 "BatchImport.c"
 		GFile* _tmp2_ = NULL;
 		PreparedFile* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
@@ -15800,15 +15807,15 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 		_tmp4_ = _tmp3_->file;
 #line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp2_ != _tmp4_;
-#line 15796 "BatchImport.c"
+#line 15803 "BatchImport.c"
 	} else {
 #line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = FALSE;
-#line 15800 "BatchImport.c"
+#line 15807 "BatchImport.c"
 	}
 #line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_) {
-#line 15804 "BatchImport.c"
+#line 15811 "BatchImport.c"
 		GFile* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
@@ -15822,7 +15829,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 		g_debug ("BatchImport.vala:1896: Deleting aborted import copy %s", _tmp7_);
 #line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp7_);
-#line 15818 "BatchImport.c"
+#line 15825 "BatchImport.c"
 		{
 			GFile* _tmp8_ = NULL;
 #line 1898 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15831,7 +15838,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 			g_file_delete (_tmp8_, NULL, &_inner_error_);
 #line 1898 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15827 "BatchImport.c"
+#line 15834 "BatchImport.c"
 				goto __catch420_g_error;
 			}
 		}
@@ -15865,7 +15872,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 			_g_free0 (_tmp11_);
 #line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (err);
-#line 15860 "BatchImport.c"
+#line 15867 "BatchImport.c"
 		}
 		__finally420:
 #line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15876,7 +15883,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 			g_clear_error (&_inner_error_);
 #line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return NULL;
-#line 15871 "BatchImport.c"
+#line 15878 "BatchImport.c"
 		}
 	}
 #line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15921,14 +15928,14 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 	result = _tmp28_;
 #line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 15916 "BatchImport.c"
+#line 15923 "BatchImport.c"
 }
 
 
 static gpointer _thumbnails_ref0 (gpointer self) {
 #line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? thumbnails_ref (self) : NULL;
-#line 15923 "BatchImport.c"
+#line 15930 "BatchImport.c"
 }
 
 
@@ -15943,7 +15950,7 @@ Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self) {
 	_tmp1_ = self->photo_import_params;
 #line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 15938 "BatchImport.c"
+#line 15945 "BatchImport.c"
 		PhotoImportParams* _tmp2_ = NULL;
 		Thumbnails* _tmp3_ = NULL;
 #line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15952,7 +15959,7 @@ Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self) {
 		_tmp3_ = _tmp2_->thumbnails;
 #line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp3_;
-#line 15947 "BatchImport.c"
+#line 15954 "BatchImport.c"
 	} else {
 		VideoImportParams* _tmp4_ = NULL;
 		Thumbnails* _tmp5_ = NULL;
@@ -15962,7 +15969,7 @@ Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self) {
 		_tmp5_ = _tmp4_->thumbnails;
 #line 1914 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp5_;
-#line 15957 "BatchImport.c"
+#line 15964 "BatchImport.c"
 	}
 #line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = _thumbnails_ref0 (_tmp0_);
@@ -15970,14 +15977,14 @@ Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self) {
 	result = _tmp6_;
 #line 1913 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 15965 "BatchImport.c"
+#line 15972 "BatchImport.c"
 }
 
 
 static void value_ready_for_import_init (GValue* value) {
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 15972 "BatchImport.c"
+#line 15979 "BatchImport.c"
 }
 
 
@@ -15986,7 +15993,7 @@ static void value_ready_for_import_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		ready_for_import_unref (value->data[0].v_pointer);
-#line 15981 "BatchImport.c"
+#line 15988 "BatchImport.c"
 	}
 }
 
@@ -15996,11 +16003,11 @@ static void value_ready_for_import_copy_value (const GValue* src_value, GValue*
 	if (src_value->data[0].v_pointer) {
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = ready_for_import_ref (src_value->data[0].v_pointer);
-#line 15991 "BatchImport.c"
+#line 15998 "BatchImport.c"
 	} else {
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 15995 "BatchImport.c"
+#line 16002 "BatchImport.c"
 	}
 }
 
@@ -16008,37 +16015,37 @@ static void value_ready_for_import_copy_value (const GValue* src_value, GValue*
 static gpointer value_ready_for_import_peek_pointer (const GValue* value) {
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 16003 "BatchImport.c"
+#line 16010 "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"
 	if (collect_values[0].v_pointer) {
-#line 16010 "BatchImport.c"
+#line 16017 "BatchImport.c"
 		ReadyForImport* object;
 		object = collect_values[0].v_pointer;
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 16017 "BatchImport.c"
+#line 16024 "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"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 16021 "BatchImport.c"
+#line 16028 "BatchImport.c"
 		}
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = ready_for_import_ref (object);
-#line 16025 "BatchImport.c"
+#line 16032 "BatchImport.c"
 	} else {
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 16029 "BatchImport.c"
+#line 16036 "BatchImport.c"
 	}
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 16033 "BatchImport.c"
+#line 16040 "BatchImport.c"
 }
 
 
@@ -16049,25 +16056,25 @@ static gchar* value_ready_for_import_lcopy_value (const GValue* value, guint n_c
 	if (!object_p) {
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 16044 "BatchImport.c"
+#line 16051 "BatchImport.c"
 	}
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 16050 "BatchImport.c"
+#line 16057 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 16054 "BatchImport.c"
+#line 16061 "BatchImport.c"
 	} else {
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = ready_for_import_ref (value->data[0].v_pointer);
-#line 16058 "BatchImport.c"
+#line 16065 "BatchImport.c"
 	}
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 16062 "BatchImport.c"
+#line 16069 "BatchImport.c"
 }
 
 
@@ -16081,7 +16088,7 @@ GParamSpec* param_spec_ready_for_import (const gchar* name, const gchar* nick, c
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 16076 "BatchImport.c"
+#line 16083 "BatchImport.c"
 }
 
 
@@ -16090,7 +16097,7 @@ gpointer value_get_ready_for_import (const GValue* value) {
 	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"
 	return value->data[0].v_pointer;
-#line 16085 "BatchImport.c"
+#line 16092 "BatchImport.c"
 }
 
 
@@ -16110,17 +16117,17 @@ void value_set_ready_for_import (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		ready_for_import_ref (value->data[0].v_pointer);
-#line 16105 "BatchImport.c"
+#line 16112 "BatchImport.c"
 	} else {
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 16109 "BatchImport.c"
+#line 16116 "BatchImport.c"
 	}
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		ready_for_import_unref (old);
-#line 16115 "BatchImport.c"
+#line 16122 "BatchImport.c"
 	}
 }
 
@@ -16139,17 +16146,17 @@ void value_take_ready_for_import (GValue* value, gpointer v_object) {
 		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"
 		value->data[0].v_pointer = v_object;
-#line 16134 "BatchImport.c"
+#line 16141 "BatchImport.c"
 	} else {
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 16138 "BatchImport.c"
+#line 16145 "BatchImport.c"
 	}
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		ready_for_import_unref (old);
-#line 16144 "BatchImport.c"
+#line 16151 "BatchImport.c"
 	}
 }
 
@@ -16159,14 +16166,14 @@ static void ready_for_import_class_init (ReadyForImportClass * klass) {
 	ready_for_import_parent_class = g_type_class_peek_parent (klass);
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((ReadyForImportClass *) klass)->finalize = ready_for_import_finalize;
-#line 16154 "BatchImport.c"
+#line 16161 "BatchImport.c"
 }
 
 
 static void ready_for_import_instance_init (ReadyForImport * self) {
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 16161 "BatchImport.c"
+#line 16168 "BatchImport.c"
 }
 
 
@@ -16186,7 +16193,7 @@ static void ready_for_import_finalize (ReadyForImport* obj) {
 	_video_import_params_unref0 (self->video_import_params);
 #line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (self->batch_result);
-#line 16181 "BatchImport.c"
+#line 16188 "BatchImport.c"
 }
 
 
@@ -16211,7 +16218,7 @@ gpointer ready_for_import_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 16206 "BatchImport.c"
+#line 16213 "BatchImport.c"
 }
 
 
@@ -16224,7 +16231,7 @@ void ready_for_import_unref (gpointer instance) {
 		READY_FOR_IMPORT_GET_CLASS (self)->finalize (self);
 #line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 16219 "BatchImport.c"
+#line 16226 "BatchImport.c"
 	}
 }
 
@@ -16278,14 +16285,14 @@ PreparedFileImportJob* prepared_file_import_job_construct (GType object_type, Ba
 	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"
 	return self;
-#line 16273 "BatchImport.c"
+#line 16280 "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"
 	return prepared_file_import_job_construct (TYPE_PREPARED_FILE_IMPORT_JOB, owner, prepared_file, import_id, callback, callback_target, cancellable, cancellation, cancellation_target);
-#line 16280 "BatchImport.c"
+#line 16287 "BatchImport.c"
 }
 
 
@@ -16364,7 +16371,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 	_tmp9_ = _tmp8_->copy_to_library;
 #line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp9_) {
-#line 16359 "BatchImport.c"
+#line 16366 "BatchImport.c"
 		{
 			GFile* _tmp10_ = NULL;
 			PreparedFile* _tmp11_ = NULL;
@@ -16383,7 +16390,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			_tmp10_ = _tmp13_;
 #line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16378 "BatchImport.c"
+#line 16385 "BatchImport.c"
 				goto __catch421_g_error;
 			}
 #line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16398,7 +16405,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			_tmp15_ = final_file;
 #line 1946 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp15_ == NULL) {
-#line 16393 "BatchImport.c"
+#line 16400 "BatchImport.c"
 				PreparedFile* _tmp16_ = NULL;
 				BatchImportJob* _tmp17_ = NULL;
 				PreparedFile* _tmp18_ = NULL;
@@ -16456,13 +16463,13 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 				_prepared_file_unref0 (prepared_file);
 #line 1951 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return;
-#line 16451 "BatchImport.c"
+#line 16458 "BatchImport.c"
 			}
 #line 1955 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp29_ = final_associated_file;
 #line 1955 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp29_ != NULL) {
-#line 16457 "BatchImport.c"
+#line 16464 "BatchImport.c"
 				GFile* _tmp30_ = NULL;
 				PreparedFile* _tmp31_ = NULL;
 				GFile* _tmp32_ = NULL;
@@ -16480,7 +16487,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (_tmp10_);
-#line 16475 "BatchImport.c"
+#line 16482 "BatchImport.c"
 					goto __catch421_g_error;
 				}
 #line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16493,11 +16500,11 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 				final_associated_file = _tmp34_;
 #line 1955 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_tmp30_);
-#line 16488 "BatchImport.c"
+#line 16495 "BatchImport.c"
 			}
 #line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_tmp10_);
-#line 16492 "BatchImport.c"
+#line 16499 "BatchImport.c"
 		}
 		goto __finally421;
 		__catch421_g_error:
@@ -16523,7 +16530,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			_tmp36_ = final_file;
 #line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp36_ != NULL) {
-#line 16518 "BatchImport.c"
+#line 16525 "BatchImport.c"
 				GFile* _tmp37_ = NULL;
 				gchar* _tmp38_ = NULL;
 #line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16534,7 +16541,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 				_g_free0 (_tmp35_);
 #line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp35_ = _tmp38_;
-#line 16529 "BatchImport.c"
+#line 16536 "BatchImport.c"
 			} else {
 				PreparedFile* _tmp39_ = NULL;
 				const gchar* _tmp40_ = NULL;
@@ -16549,7 +16556,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 				_g_free0 (_tmp35_);
 #line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp35_ = _tmp41_;
-#line 16544 "BatchImport.c"
+#line 16551 "BatchImport.c"
 			}
 #line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp42_ = g_strdup (_tmp35_);
@@ -16589,7 +16596,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			_prepared_file_unref0 (prepared_file);
 #line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 16584 "BatchImport.c"
+#line 16591 "BatchImport.c"
 		}
 		__finally421:
 #line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16606,7 +16613,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			g_clear_error (&_inner_error_);
 #line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 16601 "BatchImport.c"
+#line 16608 "BatchImport.c"
 		}
 	}
 #line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16631,7 +16638,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 	_tmp55_ = _tmp54_->is_video;
 #line 1972 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp55_) {
-#line 16626 "BatchImport.c"
+#line 16633 "BatchImport.c"
 		GFile* _tmp56_ = NULL;
 		ImportID _tmp57_ = {0};
 		PreparedFile* _tmp58_ = NULL;
@@ -16676,7 +16683,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 		_tmp67_ = video_reader_prepare_for_import (_tmp66_);
 #line 1977 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_result_ = _tmp67_;
-#line 16671 "BatchImport.c"
+#line 16678 "BatchImport.c"
 	} else {
 		GFile* _tmp68_ = NULL;
 		GFile* _tmp69_ = NULL;
@@ -16728,13 +16735,13 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 		_tmp81_ = photo_prepare_for_import (_tmp80_);
 #line 1983 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_result_ = _tmp81_;
-#line 16723 "BatchImport.c"
+#line 16730 "BatchImport.c"
 	}
 #line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp83_ = _result_;
 #line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp83_ != IMPORT_RESULT_SUCCESS) {
-#line 16729 "BatchImport.c"
+#line 16736 "BatchImport.c"
 		GFile* _tmp84_ = NULL;
 		PreparedFile* _tmp85_ = NULL;
 		GFile* _tmp86_ = NULL;
@@ -16746,15 +16753,15 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 		_tmp86_ = _tmp85_->file;
 #line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp82_ = _tmp84_ != _tmp86_;
-#line 16741 "BatchImport.c"
+#line 16748 "BatchImport.c"
 	} else {
 #line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp82_ = FALSE;
-#line 16745 "BatchImport.c"
+#line 16752 "BatchImport.c"
 	}
 #line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp82_) {
-#line 16749 "BatchImport.c"
+#line 16756 "BatchImport.c"
 		GFile* _tmp87_ = NULL;
 		gchar* _tmp88_ = NULL;
 		gchar* _tmp89_ = NULL;
@@ -16768,7 +16775,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 		g_debug ("BatchImport.vala:1987: Deleting failed imported copy %s", _tmp89_);
 #line 1987 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp89_);
-#line 16763 "BatchImport.c"
+#line 16770 "BatchImport.c"
 		{
 			GFile* _tmp90_ = NULL;
 #line 1989 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16777,7 +16784,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			g_file_delete (_tmp90_, NULL, &_inner_error_);
 #line 1989 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16772 "BatchImport.c"
+#line 16779 "BatchImport.c"
 				goto __catch422_g_error;
 			}
 		}
@@ -16810,7 +16817,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			_g_free0 (_tmp93_);
 #line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (err);
-#line 16805 "BatchImport.c"
+#line 16812 "BatchImport.c"
 		}
 		__finally422:
 #line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16831,7 +16838,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			g_clear_error (&_inner_error_);
 #line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 16826 "BatchImport.c"
+#line 16833 "BatchImport.c"
 		}
 	}
 #line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16870,7 +16877,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 	_tmp109_ = _tmp108_->result;
 #line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp109_ != IMPORT_RESULT_SUCCESS) {
-#line 16865 "BatchImport.c"
+#line 16872 "BatchImport.c"
 		BatchImportResult* _tmp110_ = NULL;
 		BatchImportResult* _tmp111_ = NULL;
 #line 2000 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16881,7 +16888,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 		_batch_import_result_unref0 (self->failed);
 #line 2000 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->failed = _tmp111_;
-#line 16876 "BatchImport.c"
+#line 16883 "BatchImport.c"
 	} else {
 		GFile* _tmp112_ = NULL;
 		PreparedFile* _tmp113_ = NULL;
@@ -16905,7 +16912,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 		_ready_for_import_unref0 (self->ready);
 #line 2002 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->ready = _tmp117_;
-#line 16900 "BatchImport.c"
+#line 16907 "BatchImport.c"
 	}
 #line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (batch_result);
@@ -16919,7 +16926,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 	_g_object_unref0 (final_file);
 #line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_prepared_file_unref0 (prepared_file);
-#line 16914 "BatchImport.c"
+#line 16921 "BatchImport.c"
 }
 
 
@@ -16931,8 +16938,8 @@ static void prepared_file_import_job_class_init (PreparedFileImportJobClass * kl
 #line 1918 "/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 = prepared_file_import_job_real_execute;
-#line 16927 "BatchImport.c"
+	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) prepared_file_import_job_real_execute;
+#line 16934 "BatchImport.c"
 }
 
 
@@ -16943,7 +16950,7 @@ static void prepared_file_import_job_instance_init (PreparedFileImportJob * self
 	self->ready = NULL;
 #line 1921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->failed = NULL;
-#line 16938 "BatchImport.c"
+#line 16945 "BatchImport.c"
 }
 
 
@@ -16959,7 +16966,7 @@ static void prepared_file_import_job_finalize (BackgroundJob* obj) {
 	_batch_import_result_unref0 (self->failed);
 #line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BACKGROUND_JOB_CLASS (prepared_file_import_job_parent_class)->finalize (obj);
-#line 16954 "BatchImport.c"
+#line 16961 "BatchImport.c"
 }
 
 
@@ -17039,21 +17046,21 @@ CompletedImportObject* completed_import_object_construct (GType object_type, Med
 	self->user_preview = _tmp9_;
 #line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 17034 "BatchImport.c"
+#line 17041 "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"
 	return completed_import_object_construct (TYPE_COMPLETED_IMPORT_OBJECT, source, thumbnails, original_job, import_result);
-#line 17041 "BatchImport.c"
+#line 17048 "BatchImport.c"
 }
 
 
 static void value_completed_import_object_init (GValue* value) {
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 17048 "BatchImport.c"
+#line 17055 "BatchImport.c"
 }
 
 
@@ -17062,7 +17069,7 @@ static void value_completed_import_object_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		completed_import_object_unref (value->data[0].v_pointer);
-#line 17057 "BatchImport.c"
+#line 17064 "BatchImport.c"
 	}
 }
 
@@ -17072,11 +17079,11 @@ static void value_completed_import_object_copy_value (const GValue* src_value, G
 	if (src_value->data[0].v_pointer) {
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = completed_import_object_ref (src_value->data[0].v_pointer);
-#line 17067 "BatchImport.c"
+#line 17074 "BatchImport.c"
 	} else {
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 17071 "BatchImport.c"
+#line 17078 "BatchImport.c"
 	}
 }
 
@@ -17084,37 +17091,37 @@ static void value_completed_import_object_copy_value (const GValue* src_value, G
 static gpointer value_completed_import_object_peek_pointer (const GValue* value) {
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 17079 "BatchImport.c"
+#line 17086 "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"
 	if (collect_values[0].v_pointer) {
-#line 17086 "BatchImport.c"
+#line 17093 "BatchImport.c"
 		CompletedImportObject* object;
 		object = collect_values[0].v_pointer;
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 17093 "BatchImport.c"
+#line 17100 "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"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 17097 "BatchImport.c"
+#line 17104 "BatchImport.c"
 		}
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = completed_import_object_ref (object);
-#line 17101 "BatchImport.c"
+#line 17108 "BatchImport.c"
 	} else {
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 17105 "BatchImport.c"
+#line 17112 "BatchImport.c"
 	}
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 17109 "BatchImport.c"
+#line 17116 "BatchImport.c"
 }
 
 
@@ -17125,25 +17132,25 @@ static gchar* value_completed_import_object_lcopy_value (const GValue* value, gu
 	if (!object_p) {
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 17120 "BatchImport.c"
+#line 17127 "BatchImport.c"
 	}
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 17126 "BatchImport.c"
+#line 17133 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 17130 "BatchImport.c"
+#line 17137 "BatchImport.c"
 	} else {
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = completed_import_object_ref (value->data[0].v_pointer);
-#line 17134 "BatchImport.c"
+#line 17141 "BatchImport.c"
 	}
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 17138 "BatchImport.c"
+#line 17145 "BatchImport.c"
 }
 
 
@@ -17157,7 +17164,7 @@ GParamSpec* param_spec_completed_import_object (const gchar* name, const gchar*
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 17152 "BatchImport.c"
+#line 17159 "BatchImport.c"
 }
 
 
@@ -17166,7 +17173,7 @@ gpointer value_get_completed_import_object (const GValue* value) {
 	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"
 	return value->data[0].v_pointer;
-#line 17161 "BatchImport.c"
+#line 17168 "BatchImport.c"
 }
 
 
@@ -17186,17 +17193,17 @@ void value_set_completed_import_object (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		completed_import_object_ref (value->data[0].v_pointer);
-#line 17181 "BatchImport.c"
+#line 17188 "BatchImport.c"
 	} else {
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 17185 "BatchImport.c"
+#line 17192 "BatchImport.c"
 	}
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		completed_import_object_unref (old);
-#line 17191 "BatchImport.c"
+#line 17198 "BatchImport.c"
 	}
 }
 
@@ -17215,17 +17222,17 @@ void value_take_completed_import_object (GValue* value, gpointer v_object) {
 		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"
 		value->data[0].v_pointer = v_object;
-#line 17210 "BatchImport.c"
+#line 17217 "BatchImport.c"
 	} else {
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 17214 "BatchImport.c"
+#line 17221 "BatchImport.c"
 	}
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		completed_import_object_unref (old);
-#line 17220 "BatchImport.c"
+#line 17227 "BatchImport.c"
 	}
 }
 
@@ -17235,14 +17242,14 @@ static void completed_import_object_class_init (CompletedImportObjectClass * kla
 	completed_import_object_parent_class = g_type_class_peek_parent (klass);
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((CompletedImportObjectClass *) klass)->finalize = completed_import_object_finalize;
-#line 17230 "BatchImport.c"
+#line 17237 "BatchImport.c"
 }
 
 
 static void completed_import_object_instance_init (CompletedImportObject * self) {
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 17237 "BatchImport.c"
+#line 17244 "BatchImport.c"
 }
 
 
@@ -17262,7 +17269,7 @@ static void completed_import_object_finalize (CompletedImportObject* obj) {
 	_batch_import_job_unref0 (self->original_job);
 #line 2012 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->user_preview);
-#line 17257 "BatchImport.c"
+#line 17264 "BatchImport.c"
 }
 
 
@@ -17287,7 +17294,7 @@ gpointer completed_import_object_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 17282 "BatchImport.c"
+#line 17289 "BatchImport.c"
 }
 
 
@@ -17300,7 +17307,7 @@ void completed_import_object_unref (gpointer instance) {
 		COMPLETED_IMPORT_OBJECT_GET_CLASS (self)->finalize (self);
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 17295 "BatchImport.c"
+#line 17302 "BatchImport.c"
 	}
 }
 
@@ -17355,14 +17362,14 @@ ThumbnailWriterJob* thumbnail_writer_job_construct (GType object_type, BatchImpo
 	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"
 	return self;
-#line 17350 "BatchImport.c"
+#line 17357 "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"
 	return thumbnail_writer_job_construct (TYPE_THUMBNAIL_WRITER_JOB, owner, completed_import_source, callback, callback_target, cancellable, cancel_callback, cancel_callback_target);
-#line 17357 "BatchImport.c"
+#line 17364 "BatchImport.c"
 }
 
 
@@ -17372,7 +17379,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 	GError * _inner_error_ = NULL;
 #line 2037 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob);
-#line 17367 "BatchImport.c"
+#line 17374 "BatchImport.c"
 	{
 		CompletedImportObject* _tmp0_ = NULL;
 		MediaSource* _tmp1_ = NULL;
@@ -17392,7 +17399,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 		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"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17387 "BatchImport.c"
+#line 17394 "BatchImport.c"
 			goto __catch423_g_error;
 		}
 #line 2041 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -17401,7 +17408,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 		_tmp5_ = _tmp4_->batch_result;
 #line 2041 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_->result = IMPORT_RESULT_SUCCESS;
-#line 17396 "BatchImport.c"
+#line 17403 "BatchImport.c"
 	}
 	goto __finally423;
 	__catch423_g_error:
@@ -17427,7 +17434,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 		_tmp7_->result = _tmp9_;
 #line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_error_free0 (err);
-#line 17422 "BatchImport.c"
+#line 17429 "BatchImport.c"
 	}
 	__finally423:
 #line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -17438,7 +17445,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 		g_clear_error (&_inner_error_);
 #line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return;
-#line 17433 "BatchImport.c"
+#line 17440 "BatchImport.c"
 	}
 #line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = self->completed_import_source;
@@ -17446,7 +17453,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 	_thumbnails_unref0 (_tmp10_->thumbnails);
 #line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_->thumbnails = NULL;
-#line 17441 "BatchImport.c"
+#line 17448 "BatchImport.c"
 }
 
 
@@ -17456,8 +17463,8 @@ static void thumbnail_writer_job_class_init (ThumbnailWriterJobClass * klass) {
 #line 2024 "/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 = thumbnail_writer_job_real_execute;
-#line 17452 "BatchImport.c"
+	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) thumbnail_writer_job_real_execute;
+#line 17459 "BatchImport.c"
 }
 
 
@@ -17473,7 +17480,7 @@ static void thumbnail_writer_job_finalize (BackgroundJob* obj) {
 	_completed_import_object_unref0 (self->completed_import_source);
 #line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BACKGROUND_JOB_CLASS (thumbnail_writer_job_parent_class)->finalize (obj);
-#line 17468 "BatchImport.c"
+#line 17475 "BatchImport.c"
 }
 
 
diff --git a/src/Box.c b/src/Box.c
index 23734f3..eb62af4 100644
--- a/src/Box.c
+++ b/src/Box.c
@@ -1,4 +1,4 @@
-/* Box.c generated by valac 0.34.4, the Vala compiler
+/* Box.c generated by valac 0.34.7, the Vala compiler
  * generated from Box.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/CheckerboardLayout.c b/src/CheckerboardLayout.c
index bf8c368..c67c8cc 100644
--- a/src/CheckerboardLayout.c
+++ b/src/CheckerboardLayout.c
@@ -1,4 +1,4 @@
-/* CheckerboardLayout.c generated by valac 0.34.4, the Vala compiler
+/* CheckerboardLayout.c generated by valac 0.34.7, the Vala compiler
  * generated from CheckerboardLayout.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -5592,33 +5592,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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -6440,7 +6440,7 @@ void checkerboard_layout_set_cursor (CheckerboardLayout* self, CheckerboardItem*
 #line 1047 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
 #line 1048 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	_tmp0_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1048 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	collection = _tmp0_;
 #line 1049 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -8065,7 +8065,7 @@ GeeList* checkerboard_layout_intersection (CheckerboardLayout* self, GdkRectangl
 #line 1306 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (area != NULL, NULL);
 #line 1307 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	_tmp0_ = gee_array_list_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1307 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	intersects = _tmp0_;
 #line 1310 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -9060,7 +9060,7 @@ static void checkerboard_layout_expose_items (CheckerboardLayout* self, const gc
 #line 1497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (caller != NULL);
 #line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	_tmp0_ = gee_hash_set_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_set_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	new_exposed_items = _tmp0_;
 #line 1502 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -12236,17 +12236,17 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -12269,7 +12269,7 @@ static void checkerboard_layout_instance_init (CheckerboardLayout * self) {
 #line 852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->_item_rows_size_ = self->priv->item_rows_length1;
 #line 853 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	_tmp1_ = gee_hash_set_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp1_ = gee_hash_set_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 853 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->exposed_items = _tmp1_;
 #line 854 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
diff --git a/src/CollectionPage.c b/src/CollectionPage.c
index 991dadb..d44af2c 100644
--- a/src/CollectionPage.c
+++ b/src/CollectionPage.c
@@ -1,4 +1,4 @@
-/* CollectionPage.c generated by valac 0.34.4, the Vala compiler
+/* CollectionPage.c generated by valac 0.34.7, the Vala compiler
  * generated from CollectionPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = collection_view_manager_real_create_view;
+	((ViewManagerClass *) klass)->create_view = (DataView* (*)(ViewManager*, DataSource*)) collection_view_manager_real_create_view;
 #line 1456 "CollectionPage.c"
 }
 
@@ -5867,7 +5867,7 @@ void collection_page_on_set_background (CollectionPage* self) {
 #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"
-	_tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photos = _tmp0_;
 #line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5889,7 +5889,7 @@ void collection_page_on_set_background (CollectionPage* self) {
 #line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = photos;
 #line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _tmp7_;
 #line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5969,7 +5969,7 @@ void collection_page_on_set_background (CollectionPage* self) {
 #line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp23_ = photos;
 #line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp24_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp24_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp25_ = _tmp24_;
 #line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6459,7 +6459,7 @@ 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 = collection_page_collection_search_view_filter_real_get_criteria;
+	((SearchViewFilterClass *) klass)->get_criteria = (guint (*)(SearchViewFilter*)) collection_page_collection_search_view_filter_real_get_criteria;
 #line 6464 "CollectionPage.c"
 }
 
@@ -6486,31 +6486,31 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
diff --git a/src/ColorTransformation.c b/src/ColorTransformation.c
index 80325c1..05b6c8b 100644
--- a/src/ColorTransformation.c
+++ b/src/ColorTransformation.c
@@ -1,4 +1,4 @@
-/* ColorTransformation.c generated by valac 0.34.4, the Vala compiler
+/* ColorTransformation.c generated by valac 0.34.7, the Vala compiler
  * generated from ColorTransformation.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2395,7 +2395,7 @@ gint pixel_transformation_bundle_get_count (PixelTransformationBundle* self) {
 #line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->map;
 #line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp1_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+	_tmp1_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = _tmp1_;
 #line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2437,7 +2437,7 @@ GeeIterable* pixel_transformation_bundle_get_transformations (PixelTransformatio
 #line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->map;
 #line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+	_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = _tmp1_;
 #line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -2889,7 +2889,7 @@ static void pixel_transformation_bundle_instance_init (PixelTransformationBundle
 #line 237 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = gee_functions_get_equal_func_for (G_TYPE_INT, &_tmp3_, &_tmp4_);
 #line 237 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp6_ = gee_hash_map_new (G_TYPE_INT, NULL, NULL, TYPE_PIXEL_TRANSFORMATION, (GBoxedCopyFunc) pixel_transformation_ref, pixel_transformation_unref, _tmp2_, _tmp0_, _tmp1_, _tmp5_, _tmp3_, _tmp4_, NULL, NULL, NULL);
+	_tmp6_ = gee_hash_map_new (G_TYPE_INT, NULL, NULL, TYPE_PIXEL_TRANSFORMATION, (GBoxedCopyFunc) pixel_transformation_ref, (GDestroyNotify) pixel_transformation_unref, _tmp2_, _tmp0_, _tmp1_, _tmp5_, _tmp3_, _tmp4_, NULL, NULL, NULL);
 #line 237 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->map = _tmp6_;
 #line 234 "/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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = pixel_transformation_real_copy;
+	((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*)(PixelTransformation*)) pixel_transformation_real_copy;
 #line 3345 "ColorTransformation.c"
 }
 
@@ -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 = 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 = 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 = 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 = 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 = 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 = 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 = rgb_transformation_real_copy;
+	((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*)(PixelTransformation*)) rgb_transformation_real_copy;
 #line 5523 "ColorTransformation.c"
 }
 
@@ -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 = 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 = 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"
 }
 
@@ -6566,7 +6566,7 @@ PixelTransformer* pixel_transformer_copy (PixelTransformer* self) {
 #line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = _transformation_list;
 #line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = _tmp4_;
 #line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -6643,7 +6643,7 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer*
 #line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->transformations;
 #line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = _tmp1_;
 #line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -6706,7 +6706,7 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer*
 #line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp7_ = self->priv->transformations;
 #line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
+				_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp9_ = _tmp8_;
 #line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -7134,7 +7134,7 @@ void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTran
 #line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp3_ = self->priv->transformations;
 #line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+				_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp5_ = _tmp4_;
 #line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -8109,7 +8109,7 @@ static void pixel_transformer_instance_init (PixelTransformer * self) {
 #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"
-	_tmp0_ = gee_array_list_new (TYPE_PIXEL_TRANSFORMATION, (GBoxedCopyFunc) pixel_transformation_ref, pixel_transformation_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_PIXEL_TRANSFORMATION, (GBoxedCopyFunc) pixel_transformation_ref, (GDestroyNotify) pixel_transformation_unref, NULL, NULL, NULL);
 #line 776 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->transformations = _tmp0_;
 #line 778 "/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 = 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 = 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 = 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 = expansion_transformation_real_copy;
+	((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*)(PixelTransformation*)) expansion_transformation_real_copy;
 #line 12552 "ColorTransformation.c"
 }
 
@@ -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 = 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 = 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 = shadow_detail_transformation_real_is_identity;
+	((PixelTransformationClass *) klass)->is_identity = (gboolean (*)(PixelTransformation*)) shadow_detail_transformation_real_is_identity;
 #line 12837 "ColorTransformation.c"
 }
 
@@ -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 = 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 = 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 = highlight_detail_transformation_real_is_identity;
+	((PixelTransformationClass *) klass)->is_identity = (gboolean (*)(PixelTransformation*)) highlight_detail_transformation_real_is_identity;
 #line 13482 "ColorTransformation.c"
 }
 
diff --git a/src/CommandManager.c b/src/CommandManager.c
index a6a282b..a661c01 100644
--- a/src/CommandManager.c
+++ b/src/CommandManager.c
@@ -1,4 +1,4 @@
-/* CommandManager.c generated by valac 0.34.4, the Vala compiler
+/* CommandManager.c generated by valac 0.34.7, the Vala compiler
  * generated from CommandManager.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -424,19 +424,19 @@ 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 = command_real_prepare;
+	((CommandClass *) klass)->prepare = (void (*)(Command*)) command_real_prepare;
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	((CommandClass *) klass)->execute = command_real_execute;
+	((CommandClass *) klass)->execute = (void (*)(Command*)) command_real_execute;
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	((CommandClass *) klass)->undo = command_real_undo;
+	((CommandClass *) klass)->undo = (void (*)(Command*)) command_real_undo;
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	((CommandClass *) klass)->redo = command_real_redo;
+	((CommandClass *) klass)->redo = (void (*)(Command*)) command_real_redo;
 #line 27 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	((CommandClass *) klass)->compress = 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 = 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 = 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"
@@ -627,7 +627,7 @@ gboolean command_manager_can_undo (CommandManager* self) {
 #line 127 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp0_ = self->priv->undo_stack;
 #line 127 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 127 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp2_ = _tmp1_;
 #line 127 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -728,7 +728,7 @@ gboolean command_manager_can_redo (CommandManager* self) {
 #line 153 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp0_ = self->priv->redo_stack;
 #line 153 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 153 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp2_ = _tmp1_;
 #line 153 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -832,7 +832,7 @@ static Command* command_manager_top (CommandManager* self, GeeArrayList* stack)
 #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp1_ = stack;
 #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp3_ = _tmp2_;
 #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -848,7 +848,7 @@ static Command* command_manager_top (CommandManager* self, GeeArrayList* stack)
 #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		_tmp5_ = stack;
 #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala"
-		_tmp6_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp6_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		_tmp7_ = _tmp6_;
 #line 179 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -901,7 +901,7 @@ static void command_manager_push (CommandManager* self, GeeArrayList* stack, Com
 #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		_tmp2_ = stack;
 #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala"
-		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala"
 		_tmp4_ = _tmp3_;
 #line 186 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -948,7 +948,7 @@ static Command* command_manager_pop (CommandManager* self, GeeArrayList* stack)
 #line 191 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp0_ = stack;
 #line 191 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 191 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp2_ = _tmp1_;
 #line 191 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -964,7 +964,7 @@ static Command* command_manager_pop (CommandManager* self, GeeArrayList* stack)
 #line 194 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp4_ = stack;
 #line 194 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 194 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	_tmp6_ = _tmp5_;
 #line 194 "/home/jens/Source/shotwell/src/CommandManager.vala"
@@ -1221,11 +1221,11 @@ static void command_manager_instance_init (CommandManager * self) {
 #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"
-	_tmp0_ = gee_array_list_new (TYPE_COMMAND, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_COMMAND, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 84 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	self->priv->undo_stack = _tmp0_;
 #line 85 "/home/jens/Source/shotwell/src/CommandManager.vala"
-	_tmp1_ = gee_array_list_new (TYPE_COMMAND, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp1_ = gee_array_list_new (TYPE_COMMAND, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 85 "/home/jens/Source/shotwell/src/CommandManager.vala"
 	self->priv->redo_stack = _tmp1_;
 #line 80 "/home/jens/Source/shotwell/src/CommandManager.vala"
diff --git a/src/Commands.c b/src/Commands.c
index e07a9de..bab2c06 100644
--- a/src/Commands.c
+++ b/src/Commands.c
@@ -1,4 +1,4 @@
-/* Commands.c generated by valac 0.34.4, the Vala compiler
+/* Commands.c generated by valac 0.34.7, the Vala compiler
  * generated from Commands.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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"
@@ -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 = 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 = 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 = 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 = 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"
@@ -3724,7 +3724,7 @@ static void simple_proxyable_command_instance_init (SimpleProxyableCommand * sel
 #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"
-	_tmp0_ = gee_hash_set_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, source_proxy_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_set_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 131 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->proxies = _tmp0_;
 #line 3731 "Commands.c"
@@ -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 = 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"
@@ -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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -4463,7 +4463,7 @@ gint multiple_data_source_command_get_source_count (MultipleDataSourceCommand* s
 #line 318 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = self->source_list;
 #line 318 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 318 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp2_ = _tmp1_;
 #line 318 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4559,7 +4559,7 @@ static void multiple_data_source_command_real_undo (Command* base) {
 #line 339 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = self->priv->acted_upon;
 #line 339 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 339 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp2_ = _tmp1_;
 #line 339 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4807,7 +4807,7 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 #line 371 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp2_ = todo;
 #line 371 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 371 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp4_ = _tmp3_;
 #line 371 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4930,7 +4930,7 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 #line 385 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp24_ = _source_list;
 #line 385 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 385 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp26_ = _tmp25_;
 #line 385 "/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 = 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 = 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 = 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 = 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"
@@ -5134,15 +5134,15 @@ static void multiple_data_source_command_instance_init (MultipleDataSourceComman
 #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"
-	_tmp0_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 278 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->source_list = _tmp0_;
 #line 282 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp1_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp1_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 282 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->acted_upon = _tmp1_;
 #line 283 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp2_ = gee_hash_set_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp2_ = gee_hash_set_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 283 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->hooked_collections = _tmp2_;
 #line 5149 "Commands.c"
@@ -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 = 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 = 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 = 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 = 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"
@@ -5773,11 +5773,11 @@ static void multiple_data_source_at_once_command_instance_init (MultipleDataSour
 #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"
-	_tmp0_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 414 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->sources = _tmp0_;
 #line 415 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp1_ = gee_hash_set_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp1_ = gee_hash_set_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 415 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->hooked_collections = _tmp1_;
 #line 5784 "Commands.c"
@@ -5916,7 +5916,7 @@ MultiplePhotoTransformationCommand* multiple_photo_transformation_command_constr
 #line 497 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = _source_list;
 #line 497 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 497 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp9_ = _tmp8_;
 #line 497 "/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 = 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"
@@ -6078,7 +6078,7 @@ static void multiple_photo_transformation_command_instance_init (MultiplePhotoTr
 #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"
-	_tmp0_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_PHOTO_TRANSFORMATION_STATE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_PHOTO_TRANSFORMATION_STATE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 490 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->map = _tmp0_;
 #line 6085 "Commands.c"
@@ -6101,7 +6101,7 @@ static void multiple_photo_transformation_command_finalize (GObject* obj) {
 #line 507 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = self->priv->map;
 #line 507 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+		_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 507 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp1_;
 #line 507 "/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 = 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 = 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"
@@ -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 = 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 = 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"
@@ -6513,9 +6513,9 @@ 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 = 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 = 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"
@@ -6637,9 +6637,9 @@ 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 = 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 = 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"
@@ -6924,9 +6924,9 @@ 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 = 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 = 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"
@@ -6936,7 +6936,7 @@ static void edit_multiple_titles_command_class_init (EditMultipleTitlesCommandCl
 static void edit_multiple_titles_command_instance_init (EditMultipleTitlesCommand * self) {
 	GeeHashMap* _tmp0_ = NULL;
 #line 606 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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"
@@ -7200,9 +7200,9 @@ 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 = 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 = 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"
@@ -7212,7 +7212,7 @@ static void edit_multiple_comments_command_class_init (EditMultipleCommentsComma
 static void edit_multiple_comments_command_instance_init (EditMultipleCommentsCommand * self) {
 	GeeHashMap* _tmp0_ = NULL;
 #line 631 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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"
@@ -7331,9 +7331,9 @@ 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 = 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 = 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"
@@ -7459,9 +7459,9 @@ 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 = 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 = 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"
@@ -7583,9 +7583,9 @@ 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 = 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 = 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"
@@ -7724,9 +7724,9 @@ 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 = 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 = revert_single_command_real_compress;
+	((CommandClass *) klass)->compress = (gboolean (*)(Command*, Command*)) revert_single_command_real_compress;
 #line 7731 "Commands.c"
 }
 
@@ -7794,7 +7794,7 @@ 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 = revert_multiple_command_real_execute_on_source;
+	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) revert_multiple_command_real_execute_on_source;
 #line 7799 "Commands.c"
 }
 
@@ -7934,9 +7934,9 @@ 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 = 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 = enhance_single_command_real_compress;
+	((CommandClass *) klass)->compress = (gboolean (*)(Command*, Command*)) enhance_single_command_real_compress;
 #line 7941 "Commands.c"
 }
 
@@ -8004,7 +8004,7 @@ 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 = enhance_multiple_command_real_execute_on_source;
+	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) enhance_multiple_command_real_execute_on_source;
 #line 8009 "Commands.c"
 }
 
@@ -8138,7 +8138,7 @@ 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 = 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"
@@ -8237,7 +8237,7 @@ 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 = 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"
@@ -8386,9 +8386,9 @@ 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 = 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 = 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"
@@ -8500,7 +8500,7 @@ 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 = 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"
@@ -8601,7 +8601,7 @@ 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 = 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"
@@ -8778,7 +8778,7 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = _source_list;
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp9_ = _tmp8_;
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8994,7 +8994,7 @@ static void move_photos_command_real_move_photos_command_real_execute (Command*
 #line 928 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand)->source_list;
 #line 928 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp14_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp14_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 928 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp15_ = _tmp14_;
 #line 928 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9193,11 +9193,11 @@ 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 = 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 = 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 = 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"
@@ -9211,7 +9211,7 @@ static void move_photos_command_real_move_photos_command_instance_init (MovePhot
 #line 887 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->new_event_proxy = NULL;
 #line 888 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, source_proxy_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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"
@@ -9242,7 +9242,7 @@ static void move_photos_command_real_move_photos_command_finalize (GObject* obj)
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = self->priv->old_events;
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp3_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MAP, GeeMap));
+		_tmp3_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = _tmp3_;
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9329,11 +9329,11 @@ 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 = 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 = 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 = 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"
@@ -9615,7 +9615,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 #line 1033 "/home/jens/Source/shotwell/src/Commands.vala"
 	unnamed_evt_src_count = 0;
 #line 1034 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp0_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
@@ -9875,7 +9875,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 #line 1073 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp49_ = media_thumbs;
 #line 1073 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp50_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp50_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1073 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp51_ = _tmp50_;
 #line 1073 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9989,7 +9989,7 @@ static void duplicate_multiple_photos_command_on_photo_destroyed (DuplicateMulti
 #line 1097 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = self->priv->dupes;
 #line 1097 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+	_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 1097 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp2_ = _tmp1_;
 #line 1097 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10251,13 +10251,13 @@ 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 = 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 = 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 = 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 = 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"
@@ -10269,7 +10269,7 @@ static void duplicate_multiple_photos_command_instance_init (DuplicateMultiplePh
 #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"
-	_tmp0_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (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);
 #line 1081 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->dupes = _tmp0_;
 #line 1082 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10470,9 +10470,9 @@ 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 = 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 = 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"
@@ -10659,7 +10659,7 @@ static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIt
 #line 1215 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (iter));
 #line 1216 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp0_ = gee_hash_map_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_RATING, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_RATING, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1216 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->last_rating_map);
 #line 1216 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10835,13 +10835,13 @@ 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 = 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 = 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 = 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 = 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"
@@ -10930,13 +10930,13 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
 #line 1262 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (iter));
 #line 1263 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp0_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_RAW_DEVELOPER, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_RAW_DEVELOPER, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1263 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->last_developer_map);
 #line 1263 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->last_developer_map = _tmp0_;
 #line 1264 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp1_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_PHOTO_TRANSFORMATION_STATE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp1_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_PHOTO_TRANSFORMATION_STATE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1264 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->last_transformation_map);
 #line 1264 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11249,13 +11249,13 @@ 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 = 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 = 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 = 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 = 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"
@@ -11594,9 +11594,9 @@ 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 = 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 = 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"
@@ -11688,7 +11688,7 @@ AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType ob
 #line 1373 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->modify_originals = _tmp5_;
 #line 1377 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp6_ = gee_hash_map_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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);
 #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"
@@ -11829,7 +11829,7 @@ AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType ob
 #line 11830 "Commands.c"
 	}
 #line 1390 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp32_ = gee_hash_map_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_INVALID, (GBoxedCopyFunc) _time_t_dup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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);
 #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"
@@ -11858,7 +11858,7 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 #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"
-	_tmp0_ = gee_array_list_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1394 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->error_list);
 #line 1394 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11868,7 +11868,7 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 #line 1397 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp1_ = self->priv->error_list;
 #line 1397 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1397 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3_ = _tmp2_;
 #line 1397 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11885,7 +11885,7 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 #line 1398 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = self->priv->error_list;
 #line 1398 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp6_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp6_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1398 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = _tmp6_;
 #line 1398 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12069,7 +12069,7 @@ static void adjust_date_time_photos_command_real_undo (Command* base) {
 #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"
-	_tmp0_ = gee_array_list_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1418 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->error_list);
 #line 1418 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12079,7 +12079,7 @@ static void adjust_date_time_photos_command_real_undo (Command* base) {
 #line 1421 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp1_ = self->priv->error_list;
 #line 1421 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1421 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3_ = _tmp2_;
 #line 1421 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12096,7 +12096,7 @@ static void adjust_date_time_photos_command_real_undo (Command* base) {
 #line 1422 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = self->priv->error_list;
 #line 1422 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp6_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp6_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1422 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = _tmp6_;
 #line 1422 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12490,13 +12490,13 @@ 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 = 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 = 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 = 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 = 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"
@@ -12704,7 +12704,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 #line 1498 "/home/jens/Source/shotwell/src/Commands.vala"
 						tag_proxy = _tmp23_;
 #line 1502 "/home/jens/Source/shotwell/src/Commands.vala"
-						_tmp24_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+						_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"
@@ -12775,7 +12775,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 #line 1508 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp36_ = add_sources;
 #line 1508 "/home/jens/Source/shotwell/src/Commands.vala"
-						_tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection));
+						_tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1508 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp38_ = _tmp37_;
 #line 1508 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12858,7 +12858,7 @@ static void add_tags_command_real_execute (Command* base) {
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = self->priv->map;
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+		_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp1_;
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12949,7 +12949,7 @@ static void add_tags_command_real_undo (Command* base) {
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = self->priv->map;
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+		_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp1_;
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13050,7 +13050,7 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = self->priv->map;
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+		_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp1_;
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13151,9 +13151,9 @@ 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 = 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 = 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"
@@ -13165,7 +13165,7 @@ static void add_tags_command_instance_init (AddTagsCommand * self) {
 #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, source_proxy_unref, GEE_TYPE_ARRAY_LIST, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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"
@@ -13192,7 +13192,7 @@ static void add_tags_command_finalize (GObject* obj) {
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = self->priv->map;
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+		_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp1_;
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13432,9 +13432,9 @@ 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 = 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 = 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"
@@ -13576,7 +13576,7 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 #line 13577 "Commands.c"
 		GeeArrayList* _tmp7_ = NULL;
 #line 1594 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp7_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, source_proxy_unref, NULL, NULL, NULL);
+		_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"
@@ -13846,9 +13846,9 @@ 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 = 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 = 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"
@@ -14010,9 +14010,9 @@ 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 = 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 = 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"
@@ -14174,9 +14174,9 @@ 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 = 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 = 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"
@@ -14745,7 +14745,7 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 #line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
 	path = _tmp6_;
 #line 1739 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp7_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp7_ = 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 1739 "/home/jens/Source/shotwell/src/Commands.vala"
 	_result_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_MAP, GeeMap);
 #line 1742 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14881,7 +14881,7 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 #line 1751 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp36_ = child_subpath;
 #line 1751 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp37_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+			_tmp37_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1751 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp38_ = _tmp37_;
 #line 1751 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15401,13 +15401,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 #line 1796 "/home/jens/Source/shotwell/src/Commands.vala"
 	_vala_assert (_tmp1_ == NULL, "dest_before_state == null");
 #line 1798 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp2_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, source_proxy_unref, NULL, NULL, NULL);
+	_tmp2_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL);
 #line 1798 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->src_before_state);
 #line 1798 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->src_before_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList);
 #line 1799 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp3_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, source_proxy_unref, NULL, NULL, NULL);
+	_tmp3_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL);
 #line 1799 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->dest_before_state);
 #line 1799 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15541,7 +15541,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 #line 1823 "/home/jens/Source/shotwell/src/Commands.vala"
 		self->priv->existing_dest_child_structure = _tmp34_;
 #line 1824 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp35_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+		_tmp35_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1824 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (self->priv->existing_dest_membership);
 #line 1824 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16383,7 +16383,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				GeeCollection* _tmp50_ = NULL;
 				GeeCollection* _tmp51_ = NULL;
 #line 1882 "/home/jens/Source/shotwell/src/Commands.vala"
-				_tmp47_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+				_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"
 				starting_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_SET, GeeSet);
 #line 1883 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17017,7 +17017,7 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
 #line 1923 "/home/jens/Source/shotwell/src/Commands.vala"
 	_vala_assert (_tmp0_ == NULL, "after_state == null");
 #line 1925 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp1_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, source_proxy_unref, NULL, NULL, NULL);
+	_tmp1_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL);
 #line 1925 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->after_state);
 #line 1925 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17402,7 +17402,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 #line 17403 "Commands.c"
 		GeeHashMap* _tmp6_ = NULL;
 #line 1970 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp6_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+		_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"
@@ -17527,7 +17527,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 #line 1977 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp28_ = current_parent_path;
 #line 1977 "/home/jens/Source/shotwell/src/Commands.vala"
-						_tmp29_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+						_tmp29_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1977 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp30_ = _tmp29_;
 #line 1977 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18216,7 +18216,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 #line 2029 "/home/jens/Source/shotwell/src/Commands.vala"
 	to_tag = _tmp6_;
 #line 2033 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp7_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp7_ = 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 2033 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->dest_parent_attachments);
 #line 2033 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18323,7 +18323,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 #line 2039 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp26_ = current_parent_path;
 #line 2039 "/home/jens/Source/shotwell/src/Commands.vala"
-					_tmp27_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+					_tmp27_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 2039 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp28_ = _tmp27_;
 #line 2039 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18979,9 +18979,9 @@ 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 = 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 = 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"
@@ -18999,7 +18999,7 @@ static void reparent_tag_command_instance_init (ReparentTagCommand * self) {
 #line 1685 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->after_state = NULL;
 #line 1686 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp0_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1686 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->sources_in_play = _tmp0_;
 #line 1687 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19219,7 +19219,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 		}
 	}
 #line 2160 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp23_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+	_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"
@@ -19428,7 +19428,7 @@ static void modify_tags_command_real_execute (Command* base) {
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _proxy_list;
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = _tmp3_;
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19515,7 +19515,7 @@ static void modify_tags_command_real_execute (Command* base) {
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp19_ = _proxy_list;
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp21_ = _tmp20_;
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19604,7 +19604,7 @@ static void modify_tags_command_real_undo (Command* base) {
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _proxy_list;
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = _tmp3_;
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19691,7 +19691,7 @@ static void modify_tags_command_real_undo (Command* base) {
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp19_ = _proxy_list;
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp21_ = _tmp20_;
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19780,9 +19780,9 @@ 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 = 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 = 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"
@@ -19795,11 +19795,11 @@ static void modify_tags_command_instance_init (ModifyTagsCommand * self) {
 #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"
-	_tmp0_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, source_proxy_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL);
 #line 2140 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->to_add = _tmp0_;
 #line 2141 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp1_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, source_proxy_unref, NULL, NULL, NULL);
+	_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"
@@ -19829,7 +19829,7 @@ static void modify_tags_command_finalize (GObject* obj) {
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _proxy_list;
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = _tmp3_;
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19902,7 +19902,7 @@ static void modify_tags_command_finalize (GObject* obj) {
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp15_ = _proxy_list;
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp17_ = _tmp16_;
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20185,7 +20185,7 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 #line 2247 "/home/jens/Source/shotwell/src/Commands.vala"
 		tag_attach_many (_tmp1_, _tmp2_);
 #line 2249 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp3_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+		_tmp3_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 2249 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (self->priv->attached_to);
 #line 2249 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20546,9 +20546,9 @@ 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 = 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 = 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"
@@ -20771,9 +20771,9 @@ 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 = 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 = 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"
@@ -20917,9 +20917,9 @@ 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 = 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 = 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"
@@ -21679,9 +21679,9 @@ 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 = 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 = 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"
@@ -22065,9 +22065,9 @@ 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 = 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 = 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"
diff --git a/src/CustomComponents.c b/src/CustomComponents.c
index bc287da..b9cd57e 100644
--- a/src/CustomComponents.c
+++ b/src/CustomComponents.c
@@ -1,4 +1,4 @@
-/* CustomComponents.c generated by valac 0.34.4, the Vala compiler
+/* CustomComponents.c generated by valac 0.34.7, the Vala compiler
  * generated from CustomComponents.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -762,7 +762,7 @@ GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) {
 #line 110 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	loaded_pixbuf = _tmp4_;
 #line 114 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp5_ = gee_hash_set_new (TYPE_RGB_ANALYTIC_PIXEL, (GBoxedCopyFunc) rgb_analytic_pixel_dup, rgb_analytic_pixel_free, _theme_loader_rgb_pixel_hash_func_gee_hash_data_func, NULL, NULL, _theme_loader_rgb_pixel_equal_func_gee_equal_data_func, NULL, NULL);
+	_tmp5_ = gee_hash_set_new (TYPE_RGB_ANALYTIC_PIXEL, (GBoxedCopyFunc) rgb_analytic_pixel_dup, (GDestroyNotify) rgb_analytic_pixel_free, _theme_loader_rgb_pixel_hash_func_gee_hash_data_func, NULL, NULL, _theme_loader_rgb_pixel_equal_func_gee_equal_data_func, NULL, NULL);
 #line 114 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	colors = _tmp5_;
 #line 117 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -944,7 +944,7 @@ GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) {
 #line 132 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_tmp39_ = colors;
 #line 132 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp40_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp40_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 132 "/home/jens/Source/shotwell/src/CustomComponents.vala"
 	_tmp41_ = _tmp40_;
 #line 132 "/home/jens/Source/shotwell/src/CustomComponents.vala"
@@ -3599,7 +3599,7 @@ static void rgb_histogram_manipulator_class_init (RGBHistogramManipulatorClass *
 #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 = 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"
diff --git a/src/Debug.c b/src/Debug.c
index 0b2c7f4..e9d753f 100644
--- a/src/Debug.c
+++ b/src/Debug.c
@@ -1,4 +1,4 @@
-/* Debug.c generated by valac 0.34.4, the Vala compiler
+/* Debug.c generated by valac 0.34.7, the Vala compiler
  * generated from Debug.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/DesktopIntegration.c b/src/DesktopIntegration.c
index 2edfc90..a93aaa1 100644
--- a/src/DesktopIntegration.c
+++ b/src/DesktopIntegration.c
@@ -1,4 +1,4 @@
-/* DesktopIntegration.c generated by valac 0.34.4, the Vala compiler
+/* DesktopIntegration.c generated by valac 0.34.7, the Vala compiler
  * generated from DesktopIntegration.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -535,7 +535,7 @@ GAppInfo* desktop_integration_get_default_app_for_mime_types (gchar** mime_types
 #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp4_ = _preferred_app_list;
 #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-		_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp6_ = _tmp5_;
 #line 38 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -741,7 +741,7 @@ SortedList* desktop_integration_get_apps_for_mime_types (gchar** mime_types, int
 	gchar** _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
 #line 54 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp0_ = sorted_list_new (g_app_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _desktop_integration_app_info_comparator_comparator, NULL);
+	_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"
 	external_apps = _tmp0_;
 #line 56 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2568,7 +2568,7 @@ void desktop_integration_set_background_slideshow (GeeCollection* photos, gdoubl
 #line 273 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	wallpaper_dir = _tmp3_;
 #line 275 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
-	_tmp4_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp4_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 275 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	exceptions = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_SET, GeeSet);
 #line 276 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
diff --git a/src/Dialogs.c b/src/Dialogs.c
index 6ebebf4..7447399 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -1,4 +1,4 @@
-/* Dialogs.c generated by valac 0.34.4, the Vala compiler
+/* Dialogs.c generated by valac 0.34.7, the Vala compiler
  * generated from Dialogs.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2942,7 +2942,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = _current_text_list;
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp3_;
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -4189,7 +4189,7 @@ static void export_dialog_instance_init (ExportDialog * self) {
 #line 157 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->table = _tmp0_;
 #line 162 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+	_tmp1_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 162 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->format_options = _tmp1_;
 #line 165 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -9317,7 +9317,7 @@ 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 = text_entry_dialog_mediator_real_on_modify_validate;
+	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*)(TextEntryDialogMediator*, const gchar*)) text_entry_dialog_mediator_real_on_modify_validate;
 #line 9307 "Dialogs.c"
 }
 
@@ -9679,7 +9679,7 @@ 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 = multi_text_entry_dialog_mediator_real_on_modify_validate;
+	((MultiTextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*)(MultiTextEntryDialogMediator*, const gchar*)) multi_text_entry_dialog_mediator_real_on_modify_validate;
 #line 9669 "Dialogs.c"
 }
 
@@ -10773,7 +10773,7 @@ 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 = 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"
@@ -11365,7 +11365,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 = 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"
@@ -12157,7 +12157,7 @@ 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 = event_rename_dialog_real_execute;
+	((EventRenameDialogClass *) klass)->execute = (gchar* (*)(EventRenameDialog*)) event_rename_dialog_real_execute;
 #line 12147 "Dialogs.c"
 }
 
@@ -12256,9 +12256,9 @@ 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 = 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 = edit_title_dialog_real_on_modify_validate;
+	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*)(TextEntryDialogMediator*, const gchar*)) edit_title_dialog_real_on_modify_validate;
 #line 12248 "Dialogs.c"
 }
 
@@ -12383,9 +12383,9 @@ 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 = 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 = edit_comment_dialog_real_on_modify_validate;
+	((MultiTextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*)(MultiTextEntryDialogMediator*, const gchar*)) edit_comment_dialog_real_on_modify_validate;
 #line 12375 "Dialogs.c"
 }
 
@@ -13462,7 +13462,7 @@ 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 = 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"
@@ -15611,7 +15611,7 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp6_ = objects;
 #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
+					_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp8_ = _tmp7_;
 #line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -15667,7 +15667,7 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 #line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = objects;
 #line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = _tmp21_;
 #line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -15989,7 +15989,7 @@ 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 = add_tags_dialog_real_on_modify_validate;
+	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*)(TextEntryDialogMediator*, const gchar*)) add_tags_dialog_real_on_modify_validate;
 #line 15977 "Dialogs.c"
 }
 
@@ -16085,7 +16085,7 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 #line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	terminal_tags = _tmp5_;
 #line 2020 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+	_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"
@@ -16302,7 +16302,7 @@ GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self) {
 #line 16286 "Dialogs.c"
 	}
 #line 2042 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp2_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 2042 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	new_tags = _tmp2_;
 #line 2045 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -16445,7 +16445,7 @@ 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 = modify_tags_dialog_real_on_modify_validate;
+	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*)(TextEntryDialogMediator*, const gchar*)) modify_tags_dialog_real_on_modify_validate;
 #line 16433 "Dialogs.c"
 }
 
@@ -17528,6 +17528,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 	gboolean _tmp2_ = FALSE;
 	GFile* _tmp3_ = NULL;
 	GFileType _tmp4_ = 0;
+	gboolean _tmp13_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = app_dirs_get_import_dir ();
@@ -17545,7 +17546,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 17532 "Dialogs.c"
+#line 17533 "Dialogs.c"
 	}
 #line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = system_pictures;
@@ -17559,7 +17560,7 @@ 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 17546 "Dialogs.c"
+#line 17547 "Dialogs.c"
 	}
 	{
 		GFileEnumerator* syspics_child_enum = NULL;
@@ -17579,7 +17580,7 @@ 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 17566 "Dialogs.c"
+#line 17567 "Dialogs.c"
 			goto __catch426_g_error;
 		}
 #line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17592,7 +17593,7 @@ 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 17579 "Dialogs.c"
+#line 17580 "Dialogs.c"
 			goto __catch426_g_error;
 		}
 #line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17615,7 +17616,7 @@ 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 17602 "Dialogs.c"
+#line 17603 "Dialogs.c"
 	}
 	goto __finally426;
 	__catch426_g_error:
@@ -17633,7 +17634,7 @@ 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 17620 "Dialogs.c"
+#line 17621 "Dialogs.c"
 	}
 	__finally426:
 #line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17643,8 +17644,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 FALSE;
-#line 17631 "Dialogs.c"
+	return _tmp13_;
+#line 17632 "Dialogs.c"
 }
 
 
@@ -17655,7 +17656,7 @@ 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 17642 "Dialogs.c"
+#line 17643 "Dialogs.c"
 }
 
 
@@ -17686,7 +17687,7 @@ 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 17673 "Dialogs.c"
+#line 17674 "Dialogs.c"
 }
 
 
@@ -17716,7 +17717,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 17703 "Dialogs.c"
+#line 17704 "Dialogs.c"
 }
 
 
@@ -17737,21 +17738,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 17724 "Dialogs.c"
+#line 17725 "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 17731 "Dialogs.c"
+#line 17732 "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 17738 "Dialogs.c"
+#line 17739 "Dialogs.c"
 }
 
 
@@ -17760,7 +17761,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 17747 "Dialogs.c"
+#line 17748 "Dialogs.c"
 }
 
 
@@ -17769,49 +17770,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 17756 "Dialogs.c"
+#line 17757 "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 17763 "Dialogs.c"
+#line 17764 "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 17770 "Dialogs.c"
+#line 17771 "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 17777 "Dialogs.c"
+#line 17778 "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 17784 "Dialogs.c"
+#line 17785 "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 17791 "Dialogs.c"
+#line 17792 "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 17798 "Dialogs.c"
+#line 17799 "Dialogs.c"
 }
 
 
@@ -17820,7 +17821,7 @@ 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 17807 "Dialogs.c"
+#line 17808 "Dialogs.c"
 }
 
 
@@ -17966,7 +17967,7 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) {
 	_tmp5_ = use_header;
 #line 2302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp5_) {
-#line 17953 "Dialogs.c"
+#line 17954 "Dialogs.c"
 		GtkWidget* null_titlebar = NULL;
 		GtkDialog* _tmp6_ = NULL;
 		GtkWidget* _tmp7_ = NULL;
@@ -17980,7 +17981,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 17967 "Dialogs.c"
+#line 17968 "Dialogs.c"
 	}
 #line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->dialog;
@@ -18104,7 +18105,7 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) {
 	_tmp45_ = help_path;
 #line 2333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp45_ == NULL) {
-#line 18091 "Dialogs.c"
+#line 18092 "Dialogs.c"
 		GtkLabel* _tmp46_ = NULL;
 		const gchar* _tmp47_ = NULL;
 		gchar* _tmp48_ = NULL;
@@ -18129,7 +18130,7 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) {
 		_g_free0 (_tmp51_);
 #line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp49_);
-#line 18116 "Dialogs.c"
+#line 18117 "Dialogs.c"
 	} else {
 		GtkLabel* _tmp52_ = NULL;
 		const gchar* _tmp53_ = NULL;
@@ -18160,7 +18161,7 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) {
 		_tmp58_ = 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 18147 "Dialogs.c"
+#line 18148 "Dialogs.c"
 	}
 #line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp59_ = self->priv->builder;
@@ -18384,14 +18385,14 @@ 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 18371 "Dialogs.c"
+#line 18372 "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 18378 "Dialogs.c"
+#line 18379 "Dialogs.c"
 }
 
 
@@ -18498,7 +18499,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 18485 "Dialogs.c"
+#line 18486 "Dialogs.c"
 }
 
 
@@ -18509,7 +18510,7 @@ 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 18496 "Dialogs.c"
+#line 18497 "Dialogs.c"
 	{
 		AppWindow* _tmp0_ = NULL;
 		AppWindow* _tmp1_ = NULL;
@@ -18526,7 +18527,7 @@ 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 18513 "Dialogs.c"
+#line 18514 "Dialogs.c"
 			goto __catch427_g_error;
 		}
 	}
@@ -18548,24 +18549,26 @@ 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 18535 "Dialogs.c"
+#line 18536 "Dialogs.c"
 	}
 	__finally427:
 #line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 18541 "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);
 #line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_clear_error (&_inner_error_);
 #line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return FALSE;
-#line 18546 "Dialogs.c"
+		return _tmp5_;
+#line 18549 "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 18552 "Dialogs.c"
+#line 18555 "Dialogs.c"
 }
 
 
@@ -18634,15 +18637,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 18621 "Dialogs.c"
+#line 18624 "Dialogs.c"
 		} else {
 #line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_vala_external_apps);
-#line 18625 "Dialogs.c"
+#line 18628 "Dialogs.c"
 		}
 #line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 18629 "Dialogs.c"
+#line 18632 "Dialogs.c"
 	}
 #line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
@@ -18690,7 +18693,7 @@ 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 18677 "Dialogs.c"
+#line 18680 "Dialogs.c"
 	{
 		GeeIterator* _app_it = NULL;
 		SortedList* _tmp18_ = NULL;
@@ -18703,7 +18706,7 @@ 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 18690 "Dialogs.c"
+#line 18693 "Dialogs.c"
 			GeeIterator* _tmp20_ = NULL;
 			gboolean _tmp21_ = FALSE;
 			GAppInfo* app = NULL;
@@ -18731,7 +18734,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 			if (!_tmp21_) {
 #line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 18718 "Dialogs.c"
+#line 18721 "Dialogs.c"
 			}
 #line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = _app_it;
@@ -18753,14 +18756,14 @@ 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 18740 "Dialogs.c"
+#line 18743 "Dialogs.c"
 			{
 				GIcon* _tmp29_ = NULL;
 #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 18747 "Dialogs.c"
+#line 18750 "Dialogs.c"
 					GdkPixbuf* _tmp30_ = NULL;
 					GIcon* _tmp31_ = NULL;
 					GFile* _tmp32_ = NULL;
@@ -18790,7 +18793,7 @@ 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 18777 "Dialogs.c"
+#line 18780 "Dialogs.c"
 						goto __catch428_g_error;
 					}
 #line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18809,14 +18812,14 @@ 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 18796 "Dialogs.c"
+#line 18799 "Dialogs.c"
 				} else {
 					GIcon* _tmp41_ = NULL;
 #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 18803 "Dialogs.c"
+#line 18806 "Dialogs.c"
 						GdkPixbuf* icon_pixbuf = NULL;
 						GtkIconTheme* _tmp42_ = NULL;
 						GIcon* _tmp43_ = NULL;
@@ -18842,7 +18845,7 @@ 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 18829 "Dialogs.c"
+#line 18832 "Dialogs.c"
 							goto __catch428_g_error;
 						}
 #line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18861,7 +18864,7 @@ 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 18848 "Dialogs.c"
+#line 18851 "Dialogs.c"
 					}
 				}
 			}
@@ -18891,7 +18894,7 @@ 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 18878 "Dialogs.c"
+#line 18881 "Dialogs.c"
 			}
 			__finally428:
 #line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18914,7 +18917,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 18901 "Dialogs.c"
+#line 18904 "Dialogs.c"
 			}
 #line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp56_ = combo_store;
@@ -18940,7 +18943,7 @@ 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 18927 "Dialogs.c"
+#line 18930 "Dialogs.c"
 				SortedList* _tmp64_ = NULL;
 				GAppInfo* _tmp65_ = NULL;
 				gint _tmp66_ = 0;
@@ -18952,17 +18955,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 18939 "Dialogs.c"
+#line 18942 "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 18945 "Dialogs.c"
+#line 18948 "Dialogs.c"
 		}
 #line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_app_it);
-#line 18949 "Dialogs.c"
+#line 18952 "Dialogs.c"
 	}
 #line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp67_ = combo_box;
@@ -18974,7 +18977,7 @@ 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 18961 "Dialogs.c"
+#line 18964 "Dialogs.c"
 		GtkComboBox* _tmp70_ = NULL;
 		gint _tmp71_ = 0;
 #line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18983,7 +18986,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 		_tmp71_ = current_app;
 #line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (_tmp70_, _tmp71_);
-#line 18970 "Dialogs.c"
+#line 18973 "Dialogs.c"
 	}
 #line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (combo_store);
@@ -18995,11 +18998,11 @@ 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 18982 "Dialogs.c"
+#line 18985 "Dialogs.c"
 	} else {
 #line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_vala_external_apps);
-#line 18986 "Dialogs.c"
+#line 18989 "Dialogs.c"
 	}
 }
 
@@ -19037,11 +19040,11 @@ 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 19024 "Dialogs.c"
+#line 19027 "Dialogs.c"
 		gint i = 0;
 #line 2471 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		i = 0;
-#line 19028 "Dialogs.c"
+#line 19031 "Dialogs.c"
 		{
 			GeeArrayList* _pf_list = NULL;
 			GeeArrayList* _tmp5_ = NULL;
@@ -19060,7 +19063,7 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = _pf_list;
 #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = _tmp8_;
 #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19069,7 +19072,7 @@ 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 19056 "Dialogs.c"
+#line 19059 "Dialogs.c"
 				gint _tmp10_ = 0;
 				gint _tmp11_ = 0;
 				gint _tmp12_ = 0;
@@ -19093,7 +19096,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 19080 "Dialogs.c"
+#line 19083 "Dialogs.c"
 				}
 #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = _pf_list;
@@ -19111,7 +19114,7 @@ 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 19098 "Dialogs.c"
+#line 19101 "Dialogs.c"
 					GtkComboBox* _tmp19_ = NULL;
 					gint _tmp20_ = 0;
 #line 2474 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19126,7 +19129,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 19113 "Dialogs.c"
+#line 19116 "Dialogs.c"
 				}
 #line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp21_ = i;
@@ -19134,11 +19137,11 @@ 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 19121 "Dialogs.c"
+#line 19124 "Dialogs.c"
 			}
 #line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_pf_list);
-#line 19125 "Dialogs.c"
+#line 19128 "Dialogs.c"
 		}
 	} else {
 		gchar* s = NULL;
@@ -19166,7 +19169,7 @@ 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 19153 "Dialogs.c"
+#line 19156 "Dialogs.c"
 			GtkComboBox* _tmp28_ = NULL;
 			GeeArrayList* _tmp29_ = NULL;
 			gint _tmp30_ = 0;
@@ -19176,36 +19179,36 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 #line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp29_ = self->priv->path_formats;
 #line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = _tmp30_;
 #line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_combo_box_set_active (_tmp28_, _tmp31_ - 1);
 #line 2485 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			found = TRUE;
-#line 19170 "Dialogs.c"
+#line 19173 "Dialogs.c"
 		}
 #line 2469 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (s);
-#line 19174 "Dialogs.c"
+#line 19177 "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 19180 "Dialogs.c"
+#line 19183 "Dialogs.c"
 		GtkComboBox* _tmp33_ = NULL;
 #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 19186 "Dialogs.c"
+#line 19189 "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 19192 "Dialogs.c"
+#line 19195 "Dialogs.c"
 }
 
 
@@ -19226,7 +19229,7 @@ void preferences_dialog_show (void) {
 	_tmp0_ = preferences_dialog_preferences_dialog;
 #line 2497 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 19213 "Dialogs.c"
+#line 19216 "Dialogs.c"
 		PreferencesDialog* _tmp1_ = NULL;
 #line 2498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = preferences_dialog_new ();
@@ -19234,7 +19237,7 @@ void preferences_dialog_show (void) {
 		_preferences_dialog_unref0 (preferences_dialog_preferences_dialog);
 #line 2498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_preferences_dialog = _tmp1_;
-#line 19221 "Dialogs.c"
+#line 19224 "Dialogs.c"
 	}
 #line 2500 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = preferences_dialog_preferences_dialog;
@@ -19270,7 +19273,7 @@ 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 19257 "Dialogs.c"
+#line 19260 "Dialogs.c"
 }
 
 
@@ -19317,7 +19320,7 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
 	_tmp5_ = autoimport;
 #line 2515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ != NULL) {
-#line 19304 "Dialogs.c"
+#line 19307 "Dialogs.c"
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
 		GtkCheckButton* _tmp8_ = NULL;
@@ -19337,7 +19340,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 19324 "Dialogs.c"
+#line 19327 "Dialogs.c"
 	}
 #line 2518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = self->priv->builder;
@@ -19351,7 +19354,7 @@ 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 19338 "Dialogs.c"
+#line 19341 "Dialogs.c"
 		ConfigFacade* _tmp15_ = NULL;
 		ConfigFacade* _tmp16_ = NULL;
 		GtkCheckButton* _tmp17_ = NULL;
@@ -19371,19 +19374,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 19358 "Dialogs.c"
+#line 19361 "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 19364 "Dialogs.c"
+#line 19367 "Dialogs.c"
 		const gchar* _tmp21_ = NULL;
 #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 19370 "Dialogs.c"
+#line 19373 "Dialogs.c"
 	}
 #line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = self->priv->path_formats;
@@ -19401,7 +19404,7 @@ 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 19388 "Dialogs.c"
+#line 19391 "Dialogs.c"
 		ConfigFacade* _tmp28_ = NULL;
 		ConfigFacade* _tmp29_ = NULL;
 		GtkEntry* _tmp30_ = NULL;
@@ -19431,7 +19434,7 @@ 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 19418 "Dialogs.c"
+#line 19421 "Dialogs.c"
 	} else {
 		ConfigFacade* _tmp35_ = NULL;
 		ConfigFacade* _tmp36_ = NULL;
@@ -19449,7 +19452,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 19436 "Dialogs.c"
+#line 19439 "Dialogs.c"
 	}
 #line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_preferences_dialog_path_format_unref0 (pf);
@@ -19457,7 +19460,7 @@ 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 19444 "Dialogs.c"
+#line 19447 "Dialogs.c"
 }
 
 
@@ -19476,7 +19479,7 @@ static gboolean preferences_dialog_on_delete (PreferencesDialog* self) {
 		result = TRUE;
 #line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 19463 "Dialogs.c"
+#line 19466 "Dialogs.c"
 	}
 #line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_commit_on_close (self);
@@ -19488,7 +19491,7 @@ static gboolean preferences_dialog_on_delete (PreferencesDialog* self) {
 	result = _tmp2_;
 #line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 19475 "Dialogs.c"
+#line 19478 "Dialogs.c"
 }
 
 
@@ -19503,7 +19506,7 @@ static void preferences_dialog_on_close (PreferencesDialog* self) {
 	if (!_tmp0_) {
 #line 2544 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 19490 "Dialogs.c"
+#line 19493 "Dialogs.c"
 	}
 #line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->dialog;
@@ -19511,7 +19514,7 @@ 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 19498 "Dialogs.c"
+#line 19501 "Dialogs.c"
 }
 
 
@@ -19532,7 +19535,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 19519 "Dialogs.c"
+#line 19522 "Dialogs.c"
 }
 
 
@@ -19552,7 +19555,7 @@ 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 19539 "Dialogs.c"
+#line 19542 "Dialogs.c"
 		GdkEventButton* _tmp4_ = NULL;
 		GdkEventType _tmp5_ = 0;
 #line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19561,15 +19564,15 @@ static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, G
 		_tmp5_ = _tmp4_->type;
 #line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp5_ == GDK_BUTTON_PRESS;
-#line 19548 "Dialogs.c"
+#line 19551 "Dialogs.c"
 	} else {
 #line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = FALSE;
-#line 19552 "Dialogs.c"
+#line 19555 "Dialogs.c"
 	}
 #line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 19556 "Dialogs.c"
+#line 19559 "Dialogs.c"
 		GdkEventButton* _tmp6_ = NULL;
 		GdkModifierType _tmp7_ = 0;
 		gboolean _tmp8_ = FALSE;
@@ -19581,15 +19584,15 @@ 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 19568 "Dialogs.c"
+#line 19571 "Dialogs.c"
 	} else {
 #line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = FALSE;
-#line 19572 "Dialogs.c"
+#line 19575 "Dialogs.c"
 	}
 #line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 19576 "Dialogs.c"
+#line 19579 "Dialogs.c"
 		GtkScale* _tmp9_ = NULL;
 		GtkAdjustment* _tmp10_ = NULL;
 		gdouble _tmp11_ = 0.0;
@@ -19613,13 +19616,13 @@ 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 19600 "Dialogs.c"
+#line 19603 "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 19606 "Dialogs.c"
+#line 19609 "Dialogs.c"
 }
 
 
@@ -19649,7 +19652,7 @@ 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 19636 "Dialogs.c"
+#line 19639 "Dialogs.c"
 		gchar* dir_pattern = NULL;
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
@@ -19679,7 +19682,7 @@ 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 19666 "Dialogs.c"
+#line 19669 "Dialogs.c"
 			gchar* _tmp12_ = NULL;
 #line 2575 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = g_strdup ("");
@@ -19687,7 +19690,7 @@ static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog*
 			_g_free0 (dir_pattern);
 #line 2575 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			dir_pattern = _tmp12_;
-#line 19674 "Dialogs.c"
+#line 19677 "Dialogs.c"
 		}
 #line 2576 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = self->priv->dir_pattern_entry;
@@ -19705,7 +19708,7 @@ 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 19692 "Dialogs.c"
+#line 19695 "Dialogs.c"
 	} else {
 		GtkEntry* _tmp17_ = NULL;
 		PreferencesDialogPathFormat* _tmp18_ = NULL;
@@ -19728,11 +19731,11 @@ 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 19715 "Dialogs.c"
+#line 19718 "Dialogs.c"
 	}
 #line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_preferences_dialog_path_format_unref0 (pf);
-#line 19719 "Dialogs.c"
+#line 19722 "Dialogs.c"
 }
 
 
@@ -19766,7 +19769,7 @@ 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 19753 "Dialogs.c"
+#line 19756 "Dialogs.c"
 		GtkEntry* _tmp8_ = NULL;
 		const gchar* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
@@ -19781,15 +19784,15 @@ 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 19768 "Dialogs.c"
+#line 19771 "Dialogs.c"
 	} else {
 #line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = FALSE;
-#line 19772 "Dialogs.c"
+#line 19775 "Dialogs.c"
 	}
 #line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 19776 "Dialogs.c"
+#line 19779 "Dialogs.c"
 		GtkLabel* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
 		GtkEntry* _tmp14_ = NULL;
@@ -19810,7 +19813,7 @@ static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog*
 		gtk_entry_set_icon_activatable (_tmp15_, GTK_ENTRY_ICON_SECONDARY, FALSE);
 #line 2593 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_set_allow_closing (self, FALSE);
-#line 19797 "Dialogs.c"
+#line 19800 "Dialogs.c"
 	} else {
 		GtkLabel* _tmp16_ = NULL;
 		const gchar* _tmp17_ = NULL;
@@ -19827,11 +19830,11 @@ static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog*
 		gtk_entry_set_icon_from_icon_name (_tmp18_, GTK_ENTRY_ICON_SECONDARY, NULL);
 #line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_set_allow_closing (self, TRUE);
-#line 19814 "Dialogs.c"
+#line 19817 "Dialogs.c"
 	}
 #line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (example);
-#line 19818 "Dialogs.c"
+#line 19821 "Dialogs.c"
 }
 
 
@@ -19851,7 +19854,7 @@ 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 19838 "Dialogs.c"
+#line 19841 "Dialogs.c"
 }
 
 
@@ -19866,7 +19869,7 @@ static gboolean preferences_dialog_get_allow_closing (PreferencesDialog* self) {
 	result = _tmp0_;
 #line 2608 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 19853 "Dialogs.c"
+#line 19856 "Dialogs.c"
 }
 
 
@@ -19889,7 +19892,7 @@ 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 19876 "Dialogs.c"
+#line 19879 "Dialogs.c"
 }
 
 
@@ -19920,7 +19923,7 @@ static void preferences_dialog_to_grayscale (PreferencesDialog* self, gdouble co
 	*result = color;
 #line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return;
-#line 19907 "Dialogs.c"
+#line 19910 "Dialogs.c"
 }
 
 
@@ -19955,7 +19958,7 @@ 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 19942 "Dialogs.c"
+#line 19945 "Dialogs.c"
 		GtkComboBox* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
 #line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -19964,7 +19967,7 @@ static void preferences_dialog_on_photo_editor_changed (PreferencesDialog* self)
 		_tmp7_ = gtk_combo_box_get_active (_tmp6_);
 #line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp7_;
-#line 19951 "Dialogs.c"
+#line 19954 "Dialogs.c"
 	} else {
 		SortedList* _tmp8_ = NULL;
 		gint _tmp9_ = 0;
@@ -19977,7 +19980,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 19964 "Dialogs.c"
+#line 19967 "Dialogs.c"
 	}
 #line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	photo_app_choice_index = _tmp0_;
@@ -20011,7 +20014,7 @@ 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 19998 "Dialogs.c"
+#line 20001 "Dialogs.c"
 }
 
 
@@ -20044,7 +20047,7 @@ 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 20031 "Dialogs.c"
+#line 20034 "Dialogs.c"
 		GtkComboBox* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
 #line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -20053,7 +20056,7 @@ static void preferences_dialog_on_raw_editor_changed (PreferencesDialog* self) {
 		_tmp7_ = gtk_combo_box_get_active (_tmp6_);
 #line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp7_;
-#line 20040 "Dialogs.c"
+#line 20043 "Dialogs.c"
 	} else {
 		SortedList* _tmp8_ = NULL;
 		gint _tmp9_ = 0;
@@ -20066,7 +20069,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 20053 "Dialogs.c"
+#line 20056 "Dialogs.c"
 	}
 #line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	raw_app_choice_index = _tmp0_;
@@ -20092,7 +20095,7 @@ 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 20079 "Dialogs.c"
+#line 20082 "Dialogs.c"
 }
 
 
@@ -20112,13 +20115,13 @@ 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 20099 "Dialogs.c"
+#line 20102 "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 20105 "Dialogs.c"
+#line 20108 "Dialogs.c"
 }
 
 
@@ -20130,20 +20133,20 @@ static void preferences_dialog_set_raw_developer_combo (PreferencesDialog* self,
 	_tmp0_ = d;
 #line 2655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == RAW_DEVELOPER_CAMERA) {
-#line 20117 "Dialogs.c"
+#line 20120 "Dialogs.c"
 		GtkComboBoxText* _tmp1_ = NULL;
 #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 20123 "Dialogs.c"
+#line 20126 "Dialogs.c"
 	} else {
 		GtkComboBoxText* _tmp2_ = NULL;
 #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 20130 "Dialogs.c"
+#line 20133 "Dialogs.c"
 	}
 }
 
@@ -20164,7 +20167,7 @@ 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 20151 "Dialogs.c"
+#line 20154 "Dialogs.c"
 }
 
 
@@ -20181,14 +20184,14 @@ 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 20168 "Dialogs.c"
+#line 20171 "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 20175 "Dialogs.c"
+#line 20178 "Dialogs.c"
 }
 
 
@@ -20205,7 +20208,7 @@ static gboolean preferences_dialog_map_event (PreferencesDialog* self) {
 	result = TRUE;
 #line 2675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 20192 "Dialogs.c"
+#line 20195 "Dialogs.c"
 }
 
 
@@ -20241,7 +20244,7 @@ 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 20228 "Dialogs.c"
+#line 20231 "Dialogs.c"
 }
 
 
@@ -20264,7 +20267,7 @@ 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 20251 "Dialogs.c"
+#line 20254 "Dialogs.c"
 }
 
 
@@ -20296,21 +20299,21 @@ static PreferencesDialogPathFormat* preferences_dialog_path_format_construct (GT
 	self->pattern = _tmp3_;
 #line 2266 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 20283 "Dialogs.c"
+#line 20286 "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 20290 "Dialogs.c"
+#line 20293 "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 20297 "Dialogs.c"
+#line 20300 "Dialogs.c"
 }
 
 
@@ -20319,7 +20322,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 20306 "Dialogs.c"
+#line 20309 "Dialogs.c"
 	}
 }
 
@@ -20329,11 +20332,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 20316 "Dialogs.c"
+#line 20319 "Dialogs.c"
 	} else {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 20320 "Dialogs.c"
+#line 20323 "Dialogs.c"
 	}
 }
 
@@ -20341,37 +20344,37 @@ 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 20328 "Dialogs.c"
+#line 20331 "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 20335 "Dialogs.c"
+#line 20338 "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 20342 "Dialogs.c"
+#line 20345 "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 20346 "Dialogs.c"
+#line 20349 "Dialogs.c"
 		}
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = preferences_dialog_path_format_ref (object);
-#line 20350 "Dialogs.c"
+#line 20353 "Dialogs.c"
 	} else {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20354 "Dialogs.c"
+#line 20357 "Dialogs.c"
 	}
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20358 "Dialogs.c"
+#line 20361 "Dialogs.c"
 }
 
 
@@ -20382,25 +20385,25 @@ static gchar* preferences_dialog_value_path_format_lcopy_value (const GValue* va
 	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 20369 "Dialogs.c"
+#line 20372 "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 20375 "Dialogs.c"
+#line 20378 "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 20379 "Dialogs.c"
+#line 20382 "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 20383 "Dialogs.c"
+#line 20386 "Dialogs.c"
 	}
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20387 "Dialogs.c"
+#line 20390 "Dialogs.c"
 }
 
 
@@ -20414,7 +20417,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 20401 "Dialogs.c"
+#line 20404 "Dialogs.c"
 }
 
 
@@ -20423,7 +20426,7 @@ 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 20410 "Dialogs.c"
+#line 20413 "Dialogs.c"
 }
 
 
@@ -20443,17 +20446,17 @@ 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 20430 "Dialogs.c"
+#line 20433 "Dialogs.c"
 	} else {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20434 "Dialogs.c"
+#line 20437 "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 20440 "Dialogs.c"
+#line 20443 "Dialogs.c"
 	}
 }
 
@@ -20472,17 +20475,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 20459 "Dialogs.c"
+#line 20462 "Dialogs.c"
 	} else {
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20463 "Dialogs.c"
+#line 20466 "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 20469 "Dialogs.c"
+#line 20472 "Dialogs.c"
 	}
 }
 
@@ -20492,14 +20495,14 @@ 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 20479 "Dialogs.c"
+#line 20482 "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 20486 "Dialogs.c"
+#line 20489 "Dialogs.c"
 }
 
 
@@ -20513,7 +20516,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 20500 "Dialogs.c"
+#line 20503 "Dialogs.c"
 }
 
 
@@ -20538,7 +20541,7 @@ static gpointer preferences_dialog_path_format_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 20525 "Dialogs.c"
+#line 20528 "Dialogs.c"
 }
 
 
@@ -20551,7 +20554,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 20538 "Dialogs.c"
+#line 20541 "Dialogs.c"
 	}
 }
 
@@ -20559,7 +20562,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 20546 "Dialogs.c"
+#line 20549 "Dialogs.c"
 }
 
 
@@ -20568,7 +20571,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 20555 "Dialogs.c"
+#line 20558 "Dialogs.c"
 	}
 }
 
@@ -20578,11 +20581,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 20565 "Dialogs.c"
+#line 20568 "Dialogs.c"
 	} else {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 20569 "Dialogs.c"
+#line 20572 "Dialogs.c"
 	}
 }
 
@@ -20590,37 +20593,37 @@ 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 20577 "Dialogs.c"
+#line 20580 "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 20584 "Dialogs.c"
+#line 20587 "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 20591 "Dialogs.c"
+#line 20594 "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 20595 "Dialogs.c"
+#line 20598 "Dialogs.c"
 		}
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = preferences_dialog_ref (object);
-#line 20599 "Dialogs.c"
+#line 20602 "Dialogs.c"
 	} else {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20603 "Dialogs.c"
+#line 20606 "Dialogs.c"
 	}
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20607 "Dialogs.c"
+#line 20610 "Dialogs.c"
 }
 
 
@@ -20631,25 +20634,25 @@ static gchar* value_preferences_dialog_lcopy_value (const GValue* value, guint n
 	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 20618 "Dialogs.c"
+#line 20621 "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 20624 "Dialogs.c"
+#line 20627 "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 20628 "Dialogs.c"
+#line 20631 "Dialogs.c"
 	} else {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = preferences_dialog_ref (value->data[0].v_pointer);
-#line 20632 "Dialogs.c"
+#line 20635 "Dialogs.c"
 	}
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20636 "Dialogs.c"
+#line 20639 "Dialogs.c"
 }
 
 
@@ -20663,7 +20666,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 20650 "Dialogs.c"
+#line 20653 "Dialogs.c"
 }
 
 
@@ -20672,7 +20675,7 @@ 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 20659 "Dialogs.c"
+#line 20662 "Dialogs.c"
 }
 
 
@@ -20692,17 +20695,17 @@ 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 20679 "Dialogs.c"
+#line 20682 "Dialogs.c"
 	} else {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20683 "Dialogs.c"
+#line 20686 "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 20689 "Dialogs.c"
+#line 20692 "Dialogs.c"
 	}
 }
 
@@ -20721,17 +20724,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 20708 "Dialogs.c"
+#line 20711 "Dialogs.c"
 	} else {
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20712 "Dialogs.c"
+#line 20715 "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 20718 "Dialogs.c"
+#line 20721 "Dialogs.c"
 	}
 }
 
@@ -20743,7 +20746,7 @@ 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 20730 "Dialogs.c"
+#line 20733 "Dialogs.c"
 }
 
 
@@ -20758,7 +20761,7 @@ static void preferences_dialog_instance_init (PreferencesDialog * self) {
 #line 2289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->lib_dir = NULL;
 #line 2290 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = gee_array_list_new (PREFERENCES_DIALOG_TYPE_PATH_FORMAT, (GBoxedCopyFunc) preferences_dialog_path_format_ref, preferences_dialog_path_format_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (PREFERENCES_DIALOG_TYPE_PATH_FORMAT, (GBoxedCopyFunc) preferences_dialog_path_format_ref, (GDestroyNotify) preferences_dialog_path_format_unref, NULL, NULL, NULL);
 #line 2290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->path_formats = _tmp0_;
 #line 2291 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -20771,7 +20774,7 @@ 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 20758 "Dialogs.c"
+#line 20761 "Dialogs.c"
 }
 
 
@@ -20817,7 +20820,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 20804 "Dialogs.c"
+#line 20807 "Dialogs.c"
 }
 
 
@@ -20842,7 +20845,7 @@ gpointer preferences_dialog_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 20829 "Dialogs.c"
+#line 20832 "Dialogs.c"
 }
 
 
@@ -20855,7 +20858,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 20842 "Dialogs.c"
+#line 20845 "Dialogs.c"
 	}
 }
 
@@ -20922,7 +20925,7 @@ GtkResponseType copy_files_dialog (void) {
 	_g_free0 (msg);
 #line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 20908 "Dialogs.c"
+#line 20911 "Dialogs.c"
 }
 
 
@@ -20943,20 +20946,20 @@ void remove_photos_from_library (GeeCollection* photos) {
 	_tmp3_ = _tmp2_;
 #line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == 1) {
-#line 20929 "Dialogs.c"
+#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 20935 "Dialogs.c"
+#line 20938 "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 20942 "Dialogs.c"
+#line 20945 "Dialogs.c"
 	}
 #line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = photos;
@@ -20964,7 +20967,7 @@ void remove_photos_from_library (GeeCollection* photos) {
 	_tmp7_ = _ ("Remove From Library");
 #line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	remove_from_app (_tmp6_, _tmp7_, _tmp0_);
-#line 20950 "Dialogs.c"
+#line 20953 "Dialogs.c"
 }
 
 
@@ -20973,7 +20976,7 @@ 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 20959 "Dialogs.c"
+#line 20962 "Dialogs.c"
 }
 
 
@@ -21060,14 +21063,14 @@ 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 21046 "Dialogs.c"
+#line 21049 "Dialogs.c"
 	}
 #line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp3_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	photos = _tmp3_;
 #line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp4_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	videos = _tmp4_;
 #line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -21088,7 +21091,7 @@ 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 21074 "Dialogs.c"
+#line 21077 "Dialogs.c"
 		GeeArrayList* _tmp12_ = NULL;
 		gboolean _tmp13_ = FALSE;
 		gboolean _tmp14_ = FALSE;
@@ -21100,15 +21103,15 @@ 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 21086 "Dialogs.c"
+#line 21089 "Dialogs.c"
 	} else {
 #line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = FALSE;
-#line 21090 "Dialogs.c"
+#line 21093 "Dialogs.c"
 	}
 #line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_) {
-#line 21094 "Dialogs.c"
+#line 21097 "Dialogs.c"
 		GeeCollection* _tmp15_ = NULL;
 		gint _tmp16_ = 0;
 		gint _tmp17_ = 0;
@@ -21143,7 +21146,7 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 		_g_free0 (user_message);
 #line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		user_message = _tmp22_;
-#line 21123 "Dialogs.c"
+#line 21126 "Dialogs.c"
 	} else {
 		GeeArrayList* _tmp23_ = NULL;
 		gboolean _tmp24_ = FALSE;
@@ -21156,7 +21159,7 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 		_tmp25_ = _tmp24_;
 #line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (!_tmp25_) {
-#line 21136 "Dialogs.c"
+#line 21139 "Dialogs.c"
 			GeeCollection* _tmp26_ = NULL;
 			gint _tmp27_ = 0;
 			gint _tmp28_ = 0;
@@ -21191,7 +21194,7 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 			_g_free0 (user_message);
 #line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			user_message = _tmp33_;
-#line 21165 "Dialogs.c"
+#line 21168 "Dialogs.c"
 		} else {
 			GeeCollection* _tmp34_ = NULL;
 			gint _tmp35_ = 0;
@@ -21227,7 +21230,7 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 			_g_free0 (user_message);
 #line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			user_message = _tmp41_;
-#line 21195 "Dialogs.c"
+#line 21198 "Dialogs.c"
 		}
 	}
 #line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -21256,17 +21259,17 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 	_tmp52_ = _result_;
 #line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp52_ != GTK_RESPONSE_YES) {
-#line 21224 "Dialogs.c"
+#line 21227 "Dialogs.c"
 		GtkResponseType _tmp53_ = 0;
 #line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp53_ = _result_;
 #line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp51_ = _tmp53_ != GTK_RESPONSE_NO;
-#line 21230 "Dialogs.c"
+#line 21233 "Dialogs.c"
 	} else {
 #line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp51_ = FALSE;
-#line 21234 "Dialogs.c"
+#line 21237 "Dialogs.c"
 	}
 #line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp51_) {
@@ -21278,7 +21281,7 @@ 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 21246 "Dialogs.c"
+#line 21249 "Dialogs.c"
 	}
 #line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp54_ = _result_;
@@ -21308,7 +21311,7 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 	_tmp59_ = _tmp58_;
 #line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp59_ >= 20) {
-#line 21276 "Dialogs.c"
+#line 21279 "Dialogs.c"
 		AppWindow* _tmp60_ = NULL;
 		AppWindow* _tmp61_ = NULL;
 		const gchar* _tmp62_ = NULL;
@@ -21346,14 +21349,14 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 		monitor_target = g_object_ref (_tmp64_);
 #line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target_destroy_notify = g_object_unref;
-#line 21314 "Dialogs.c"
+#line 21317 "Dialogs.c"
 	}
 #line 2753 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp65_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp65_ = 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_;
 #line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp66_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp66_ = 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_;
 #line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -21387,13 +21390,13 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 #line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp77_ = 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_COLLECTION, GeeCollection));
+	_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"
 	_tmp79_ = _tmp78_;
 #line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp80_ = 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_COLLECTION, GeeCollection));
+	_tmp81_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp82_ = _tmp81_;
 #line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -21402,21 +21405,21 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 	_tmp84_ = delete_backing;
 #line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp84_) {
-#line 21370 "Dialogs.c"
+#line 21373 "Dialogs.c"
 		gint _tmp85_ = 0;
 #line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp85_ = num_not_removed;
 #line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp83_ = _tmp85_ > 0;
-#line 21376 "Dialogs.c"
+#line 21379 "Dialogs.c"
 	} else {
 #line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp83_ = FALSE;
-#line 21380 "Dialogs.c"
+#line 21383 "Dialogs.c"
 	}
 #line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp83_) {
-#line 21384 "Dialogs.c"
+#line 21387 "Dialogs.c"
 		gchar* not_deleted_message = NULL;
 		gint _tmp86_ = 0;
 		const gchar* _tmp87_ = NULL;
@@ -21462,7 +21465,7 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 		_tmp96_ = result_delete;
 #line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (GTK_RESPONSE_YES == _tmp96_) {
-#line 21428 "Dialogs.c"
+#line 21431 "Dialogs.c"
 			GeeArrayList* not_deleted_photos = NULL;
 			GeeArrayList* _tmp97_ = NULL;
 			GeeArrayList* not_deleted_videos = NULL;
@@ -21486,11 +21489,11 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 			gint _tmp112_ = 0;
 			gint _tmp113_ = 0;
 #line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp97_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+			_tmp97_ = 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_;
 #line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp98_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+			_tmp98_ = 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_;
 #line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -21520,13 +21523,13 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 #line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp107_ = 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_COLLECTION, GeeCollection));
+			_tmp108_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp109_ = _tmp108_;
 #line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp110_ = 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_COLLECTION, GeeCollection));
+			_tmp111_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp112_ = _tmp111_;
 #line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -21535,7 +21538,7 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 			_tmp113_ = num_not_deleted;
 #line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp113_ > 0) {
-#line 21501 "Dialogs.c"
+#line 21504 "Dialogs.c"
 				gchar* delete_failed_message = NULL;
 				gint _tmp114_ = 0;
 				const gchar* _tmp115_ = NULL;
@@ -21569,29 +21572,29 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 				_g_object_unref0 (_tmp121_);
 #line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (delete_failed_message);
-#line 21535 "Dialogs.c"
+#line 21538 "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 21541 "Dialogs.c"
+#line 21544 "Dialogs.c"
 		}
 #line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (not_deleted_message);
-#line 21545 "Dialogs.c"
+#line 21548 "Dialogs.c"
 	}
 #line 2789 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp122_ = progress;
 #line 2789 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp122_ != NULL) {
-#line 21551 "Dialogs.c"
+#line 21554 "Dialogs.c"
 		ProgressDialog* _tmp123_ = NULL;
 #line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp123_ = progress;
 #line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		progress_dialog_close (_tmp123_);
-#line 21557 "Dialogs.c"
+#line 21560 "Dialogs.c"
 	}
 #line 2792 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp124_ = app_window_get_instance ();
@@ -21621,7 +21624,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 21587 "Dialogs.c"
+#line 21590 "Dialogs.c"
 }
 
 
diff --git a/src/Dimensions.c b/src/Dimensions.c
index 8dea342..9756ad1 100644
--- a/src/Dimensions.c
+++ b/src/Dimensions.c
@@ -1,4 +1,4 @@
-/* Dimensions.c generated by valac 0.34.4, the Vala compiler
+/* Dimensions.c generated by valac 0.34.7, the Vala compiler
  * generated from Dimensions.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/DirectoryMonitor.c b/src/DirectoryMonitor.c
index 2762dfe..6467ece 100644
--- a/src/DirectoryMonitor.c
+++ b/src/DirectoryMonitor.c
@@ -1,4 +1,4 @@
-/* DirectoryMonitor.c generated by valac 0.34.4, the Vala compiler
+/* DirectoryMonitor.c generated by valac 0.34.7, the Vala compiler
  * generated from DirectoryMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2099,13 +2099,13 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire
 #line 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp0_ = NULL;
 #line 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
+	_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 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->file_children = _data_->_tmp0_;
 #line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp1_ = NULL;
 #line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
+	_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 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->dir_children = _data_->_tmp1_;
 #line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -2155,7 +2155,7 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire
 #line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp11_ = 0;
 #line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp10_, GEE_TYPE_COLLECTION, GeeCollection));
+			_data_->_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp12_ = 0;
 #line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -2323,7 +2323,7 @@ static gboolean directory_monitor_async_internal_notify_directory_moved_co (Dire
 #line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp38_ = 0;
 #line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp38_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp37_, GEE_TYPE_COLLECTION, GeeCollection));
+			_data_->_tmp38_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp39_ = 0;
 #line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -2948,13 +2948,13 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo
 #line 744 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp0_ = NULL;
 #line 744 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
+	_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 744 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->file_children = _data_->_tmp0_;
 #line 745 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->_tmp1_ = NULL;
 #line 745 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_data_->_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
+	_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 745 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_data_->dir_children = _data_->_tmp1_;
 #line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -3004,7 +3004,7 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo
 #line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp11_ = 0;
 #line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp10_, GEE_TYPE_COLLECTION, GeeCollection));
+			_data_->_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp12_ = 0;
 #line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -3089,7 +3089,7 @@ static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMo
 #line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp23_ = 0;
 #line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp23_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp22_, GEE_TYPE_COLLECTION, GeeCollection));
+			_data_->_tmp23_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp24_ = 0;
 #line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -3411,7 +3411,7 @@ static void directory_monitor_real_close (DirectoryMonitor* self) {
 #line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp1_ = self->priv->monitors;
 #line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_tmp2_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MAP, GeeMap));
+		_tmp2_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp3_ = _tmp2_;
 #line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4250,7 +4250,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 										_data_->_tmp72_ = NULL;
 #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-										_data_->_tmp72_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+										_data_->_tmp72_ = 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 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 										_g_object_unref0 (_data_->file_map);
 #line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4306,7 +4306,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 										_data_->_tmp81_ = NULL;
 #line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-										_data_->_tmp81_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+										_data_->_tmp81_ = 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 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 										_g_object_unref0 (_data_->dir_map);
 #line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4544,7 +4544,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp109_ = NULL;
 #line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-			_data_->_tmp109_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp108_, GEE_TYPE_MAP, GeeMap));
+			_data_->_tmp109_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp108_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp110_ = NULL;
 #line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4977,15 +4977,15 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 	const gchar* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
 	GFileMonitor* monitor = NULL;
-	GeeHashMap* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	GFileMonitor* _tmp20_ = NULL;
+	GeeHashMap* _tmp19_ = NULL;
+	const gchar* _tmp20_ = NULL;
 	GFileMonitor* _tmp21_ = NULL;
-	GFile* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
+	GFileMonitor* _tmp22_ = NULL;
+	GFile* _tmp23_ = NULL;
 	gchar* _tmp24_ = NULL;
 	gchar* _tmp25_ = NULL;
 	gchar* _tmp26_ = NULL;
+	gchar* _tmp27_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 1008 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE);
@@ -5114,6 +5114,8 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 	__finally482:
 #line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 5114 "DirectoryMonitor.c"
+		gboolean _tmp18_ = FALSE;
 #line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (monitor);
 #line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5123,37 +5125,37 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 #line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		g_clear_error (&_inner_error_);
 #line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		return FALSE;
-#line 5124 "DirectoryMonitor.c"
+		return _tmp18_;
+#line 5126 "DirectoryMonitor.c"
 	}
 #line 1029 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_tmp18_ = self->priv->monitors;
+	_tmp19_ = self->priv->monitors;
 #line 1029 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_tmp19_ = id;
+	_tmp20_ = id;
 #line 1029 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_tmp20_ = monitor;
+	_tmp21_ = monitor;
 #line 1029 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp19_, _tmp20_);
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_, _tmp21_);
 #line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_tmp21_ = monitor;
+	_tmp22_ = monitor;
 #line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	g_signal_connect_object (_tmp21_, "changed", (GCallback) _directory_monitor_on_monitor_notification_g_file_monitor_changed, self, 0);
+	g_signal_connect_object (_tmp22_, "changed", (GCallback) _directory_monitor_on_monitor_notification_g_file_monitor_changed, self, 0);
 #line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_tmp22_ = dir;
+	_tmp23_ = dir;
 #line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_tmp23_ = g_file_get_path (_tmp22_);
+	_tmp24_ = g_file_get_path (_tmp23_);
 #line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_tmp24_ = _tmp23_;
+	_tmp25_ = _tmp24_;
 #line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_tmp25_ = g_strdup_printf ("Added monitor for %s", _tmp24_);
+	_tmp26_ = g_strdup_printf ("Added monitor for %s", _tmp25_);
 #line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_tmp26_ = _tmp25_;
+	_tmp27_ = _tmp26_;
 #line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	directory_monitor_mdbg (_tmp26_);
+	directory_monitor_mdbg (_tmp27_);
 #line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_g_free0 (_tmp26_);
+	_g_free0 (_tmp27_);
 #line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_g_free0 (_tmp24_);
+	_g_free0 (_tmp25_);
 #line 1034 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	result = TRUE;
 #line 1034 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5162,7 +5164,7 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 	_g_free0 (id);
 #line 1034 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 5162 "DirectoryMonitor.c"
+#line 5164 "DirectoryMonitor.c"
 }
 
 
@@ -5205,7 +5207,7 @@ static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile*
 		result = FALSE;
 #line 1040 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 5205 "DirectoryMonitor.c"
+#line 5207 "DirectoryMonitor.c"
 	}
 #line 1042 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp1_ = self->priv->files;
@@ -5227,7 +5229,7 @@ static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile*
 		_g_free0 (id);
 #line 1044 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 5227 "DirectoryMonitor.c"
+#line 5229 "DirectoryMonitor.c"
 	}
 #line 1046 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp6_ = self->priv->monitors;
@@ -5249,7 +5251,7 @@ static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile*
 		_g_free0 (id);
 #line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 5249 "DirectoryMonitor.c"
+#line 5251 "DirectoryMonitor.c"
 	}
 #line 1050 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp10_ = self->priv->monitors;
@@ -5291,7 +5293,7 @@ static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile*
 	_g_free0 (id);
 #line 1057 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 5291 "DirectoryMonitor.c"
+#line 5293 "DirectoryMonitor.c"
 }
 
 
@@ -5313,7 +5315,7 @@ static void directory_monitor_cancel_monitor (DirectoryMonitor* self, GFileMonit
 	_tmp2_ = monitor;
 #line 1062 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_file_monitor_cancel (_tmp2_);
-#line 5313 "DirectoryMonitor.c"
+#line 5315 "DirectoryMonitor.c"
 }
 
 
@@ -5322,7 +5324,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 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_query_info_queue_element_unref (self);
-#line 5322 "DirectoryMonitor.c"
+#line 5324 "DirectoryMonitor.c"
 }
 
 
@@ -5331,7 +5333,7 @@ static gboolean _directory_monitor_check_for_expired_delete_events_gsource_func
 	result = directory_monitor_check_for_expired_delete_events ((DirectoryMonitor*) self);
 #line 1091 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 5331 "DirectoryMonitor.c"
+#line 5333 "DirectoryMonitor.c"
 }
 
 
@@ -5363,7 +5365,7 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G
 	_tmp1_ = other_file;
 #line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp1_ != NULL) {
-#line 5363 "DirectoryMonitor.c"
+#line 5365 "DirectoryMonitor.c"
 		GFile* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 #line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5374,7 +5376,7 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G
 		_g_free0 (_tmp0_);
 #line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp0_ = _tmp3_;
-#line 5374 "DirectoryMonitor.c"
+#line 5376 "DirectoryMonitor.c"
 	} else {
 		gchar* _tmp4_ = NULL;
 #line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5383,7 +5385,7 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G
 		_g_free0 (_tmp0_);
 #line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp0_ = _tmp4_;
-#line 5383 "DirectoryMonitor.c"
+#line 5385 "DirectoryMonitor.c"
 	}
 #line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp5_ = event;
@@ -5429,7 +5431,7 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G
 		case G_FILE_MONITOR_EVENT_CREATED:
 #line 1079 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
-#line 5429 "DirectoryMonitor.c"
+#line 5431 "DirectoryMonitor.c"
 		{
 			GFile* _tmp19_ = NULL;
 			GCancellable* _tmp20_ = NULL;
@@ -5444,39 +5446,39 @@ 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 1084 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 5444 "DirectoryMonitor.c"
+#line 5446 "DirectoryMonitor.c"
 		}
 #line 1079 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_DELETED:
-#line 5448 "DirectoryMonitor.c"
+#line 5450 "DirectoryMonitor.c"
 		{
 			guint _tmp22_ = 0U;
 #line 1090 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp22_ = self->priv->delete_timer_id;
 #line 1090 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp22_ == ((guint) 0)) {
-#line 5455 "DirectoryMonitor.c"
+#line 5457 "DirectoryMonitor.c"
 				guint _tmp23_ = 0U;
 #line 1091 "/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 1091 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				self->priv->delete_timer_id = _tmp23_;
-#line 5461 "DirectoryMonitor.c"
+#line 5463 "DirectoryMonitor.c"
 			}
 #line 1092 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 5465 "DirectoryMonitor.c"
+#line 5467 "DirectoryMonitor.c"
 		}
 #line 1079 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_MOVED:
-#line 5469 "DirectoryMonitor.c"
+#line 5471 "DirectoryMonitor.c"
 		{
 			GFile* _tmp24_ = NULL;
 #line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp24_ = other_file;
 #line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp24_ != NULL) {
-#line 5476 "DirectoryMonitor.c"
+#line 5478 "DirectoryMonitor.c"
 				GFile* _tmp25_ = NULL;
 				GCancellable* _tmp26_ = NULL;
 				DirectoryMonitorQueryInfoQueueElement* _tmp27_ = NULL;
@@ -5488,7 +5490,7 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G
 				_tmp27_ = query_info;
 #line 1098 "/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 5488 "DirectoryMonitor.c"
+#line 5490 "DirectoryMonitor.c"
 			} else {
 				GeeQueue* _tmp28_ = NULL;
 				DirectoryMonitorQueryInfoQueueElement* _tmp29_ = NULL;
@@ -5501,11 +5503,11 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G
 				_tmp29_ = query_info;
 #line 1102 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection), _tmp29_);
-#line 5500 "DirectoryMonitor.c"
+#line 5502 "DirectoryMonitor.c"
 			}
 #line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 5504 "DirectoryMonitor.c"
+#line 5506 "DirectoryMonitor.c"
 		}
 		default:
 		{
@@ -5521,14 +5523,14 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G
 			directory_monitor_process_query_queue (self, _tmp31_);
 #line 1110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 5520 "DirectoryMonitor.c"
+#line 5522 "DirectoryMonitor.c"
 		}
 	}
 #line 1065 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_directory_monitor_query_info_queue_element_unref0 (query_info);
 #line 1065 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_free0 (_tmp0_);
-#line 5527 "DirectoryMonitor.c"
+#line 5529 "DirectoryMonitor.c"
 }
 
 
@@ -5544,7 +5546,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 	_tmp2_ = query_info;
 #line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp2_ != NULL) {
-#line 5543 "DirectoryMonitor.c"
+#line 5545 "DirectoryMonitor.c"
 		DirectoryMonitorQueryInfoQueueElement* _tmp3_ = NULL;
 		GFileInfo* _tmp4_ = NULL;
 #line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5553,15 +5555,15 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 		_tmp4_ = _tmp3_->info;
 #line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp1_ = _tmp4_ != NULL;
-#line 5552 "DirectoryMonitor.c"
+#line 5554 "DirectoryMonitor.c"
 	} else {
 #line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp1_ = FALSE;
-#line 5556 "DirectoryMonitor.c"
+#line 5558 "DirectoryMonitor.c"
 	}
 #line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp1_) {
-#line 5560 "DirectoryMonitor.c"
+#line 5562 "DirectoryMonitor.c"
 		DirectoryMonitorQueryInfoQueueElement* _tmp5_ = NULL;
 		GFileMonitorEvent _tmp6_ = 0;
 #line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5570,15 +5572,15 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 		_tmp6_ = _tmp5_->event;
 #line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp0_ = _tmp6_ == G_FILE_MONITOR_EVENT_CREATED;
-#line 5569 "DirectoryMonitor.c"
+#line 5571 "DirectoryMonitor.c"
 	} else {
 #line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp0_ = FALSE;
-#line 5573 "DirectoryMonitor.c"
+#line 5575 "DirectoryMonitor.c"
 	}
 #line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp0_) {
-#line 5577 "DirectoryMonitor.c"
+#line 5579 "DirectoryMonitor.c"
 		GFile* match = NULL;
 		DirectoryMonitorFileInfoMap* _tmp7_ = NULL;
 		DirectoryMonitorQueryInfoQueueElement* _tmp8_ = NULL;
@@ -5599,12 +5601,12 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 		_tmp11_ = match;
 #line 1121 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (_tmp11_ != NULL) {
-#line 5598 "DirectoryMonitor.c"
+#line 5600 "DirectoryMonitor.c"
 			gboolean matched = FALSE;
 			gboolean _tmp48_ = FALSE;
 #line 1122 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			matched = FALSE;
-#line 5603 "DirectoryMonitor.c"
+#line 5605 "DirectoryMonitor.c"
 			{
 				GeeIterator* _enqueued_it = NULL;
 				GeeQueue* _tmp12_ = NULL;
@@ -5617,7 +5619,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 				_enqueued_it = _tmp13_;
 #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				while (TRUE) {
-#line 5616 "DirectoryMonitor.c"
+#line 5618 "DirectoryMonitor.c"
 					GeeIterator* _tmp14_ = NULL;
 					gboolean _tmp15_ = FALSE;
 					DirectoryMonitorQueryInfoQueueElement* enqueued = NULL;
@@ -5655,7 +5657,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 					if (!_tmp15_) {
 #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						break;
-#line 5654 "DirectoryMonitor.c"
+#line 5656 "DirectoryMonitor.c"
 					}
 #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp16_ = _enqueued_it;
@@ -5671,7 +5673,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 					if (_tmp21_ != G_FILE_MONITOR_EVENT_DELETED) {
 #line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						_tmp19_ = TRUE;
-#line 5670 "DirectoryMonitor.c"
+#line 5672 "DirectoryMonitor.c"
 					} else {
 						DirectoryMonitorQueryInfoQueueElement* _tmp22_ = NULL;
 						gboolean _tmp23_ = FALSE;
@@ -5681,13 +5683,13 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 						_tmp23_ = _tmp22_->completed;
 #line 1125 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						_tmp19_ = _tmp23_;
-#line 5680 "DirectoryMonitor.c"
+#line 5682 "DirectoryMonitor.c"
 					}
 #line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					if (_tmp19_) {
 #line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						_tmp18_ = TRUE;
-#line 5686 "DirectoryMonitor.c"
+#line 5688 "DirectoryMonitor.c"
 					} else {
 						GFile* _tmp24_ = NULL;
 						DirectoryMonitorQueryInfoQueueElement* _tmp25_ = NULL;
@@ -5703,7 +5705,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 						_tmp27_ = g_file_equal (_tmp24_, _tmp26_);
 #line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						_tmp18_ = !_tmp27_;
-#line 5702 "DirectoryMonitor.c"
+#line 5704 "DirectoryMonitor.c"
 					}
 #line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					if (_tmp18_) {
@@ -5711,7 +5713,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 						_directory_monitor_query_info_queue_element_unref0 (enqueued);
 #line 1127 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						continue;
-#line 5710 "DirectoryMonitor.c"
+#line 5712 "DirectoryMonitor.c"
 					}
 #line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp28_ = query_info;
@@ -5779,17 +5781,17 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 					_directory_monitor_query_info_queue_element_unref0 (enqueued);
 #line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 5778 "DirectoryMonitor.c"
+#line 5780 "DirectoryMonitor.c"
 				}
 #line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_g_object_unref0 (_enqueued_it);
-#line 5782 "DirectoryMonitor.c"
+#line 5784 "DirectoryMonitor.c"
 			}
 #line 1143 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp48_ = matched;
 #line 1143 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp48_) {
-#line 5788 "DirectoryMonitor.c"
+#line 5790 "DirectoryMonitor.c"
 				GeeQueue* _tmp49_ = NULL;
 				DirectoryMonitorQueryInfoQueueElement* _tmp50_ = NULL;
 #line 1144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5798,12 +5800,12 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 				_tmp50_ = query_info;
 #line 1144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_COLLECTION, GeeCollection), _tmp50_);
-#line 5797 "DirectoryMonitor.c"
+#line 5799 "DirectoryMonitor.c"
 			}
 		}
 #line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (match);
-#line 5802 "DirectoryMonitor.c"
+#line 5804 "DirectoryMonitor.c"
 	}
 	{
 		gboolean _tmp51_ = FALSE;
@@ -5811,7 +5813,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 		_tmp51_ = TRUE;
 #line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		while (TRUE) {
-#line 5810 "DirectoryMonitor.c"
+#line 5812 "DirectoryMonitor.c"
 			DirectoryMonitorQueryInfoQueueElement* next = NULL;
 			GeeQueue* _tmp52_ = NULL;
 			gpointer _tmp53_ = NULL;
@@ -5851,7 +5853,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 			GFileMonitorEvent _tmp125_ = 0;
 #line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (!_tmp51_) {
-#line 5850 "DirectoryMonitor.c"
+#line 5852 "DirectoryMonitor.c"
 			}
 #line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp51_ = FALSE;
@@ -5867,7 +5869,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 			if (_tmp55_ == NULL) {
 #line 1152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp54_ = TRUE;
-#line 5866 "DirectoryMonitor.c"
+#line 5868 "DirectoryMonitor.c"
 			} else {
 				DirectoryMonitorQueryInfoQueueElement* _tmp56_ = NULL;
 				gboolean _tmp57_ = FALSE;
@@ -5877,7 +5879,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 				_tmp57_ = _tmp56_->completed;
 #line 1152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp54_ = !_tmp57_;
-#line 5876 "DirectoryMonitor.c"
+#line 5878 "DirectoryMonitor.c"
 			}
 #line 1152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp54_) {
@@ -5885,7 +5887,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 				_directory_monitor_query_info_queue_element_unref0 (next);
 #line 1153 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				break;
-#line 5884 "DirectoryMonitor.c"
+#line 5886 "DirectoryMonitor.c"
 			}
 #line 1156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp58_ = self->priv->query_info_queue;
@@ -5933,7 +5935,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 			_tmp74_ = _tmp73_->err;
 #line 1162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp74_ != NULL) {
-#line 5932 "DirectoryMonitor.c"
+#line 5934 "DirectoryMonitor.c"
 				DirectoryMonitorQueryInfoQueueElement* _tmp75_ = NULL;
 				GFile* _tmp76_ = NULL;
 				gchar* _tmp77_ = NULL;
@@ -5982,7 +5984,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 				_directory_monitor_query_info_queue_element_unref0 (next);
 #line 1166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				continue;
-#line 5981 "DirectoryMonitor.c"
+#line 5983 "DirectoryMonitor.c"
 			}
 #line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp88_ = next;
@@ -5990,7 +5992,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 			_tmp89_ = _tmp88_->info;
 #line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp89_ != NULL) {
-#line 5989 "DirectoryMonitor.c"
+#line 5991 "DirectoryMonitor.c"
 				DirectoryMonitorQueryInfoQueueElement* _tmp90_ = NULL;
 				GFileInfo* _tmp91_ = NULL;
 				gchar* _tmp92_ = NULL;
@@ -6007,15 +6009,15 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 				_tmp87_ = _tmp93_ == NULL;
 #line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_g_free0 (_tmp93_);
-#line 6006 "DirectoryMonitor.c"
+#line 6008 "DirectoryMonitor.c"
 			} else {
 #line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp87_ = FALSE;
-#line 6010 "DirectoryMonitor.c"
+#line 6012 "DirectoryMonitor.c"
 			}
 #line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp87_) {
-#line 6014 "DirectoryMonitor.c"
+#line 6016 "DirectoryMonitor.c"
 				DirectoryMonitorQueryInfoQueueElement* _tmp94_ = NULL;
 				GFile* _tmp95_ = NULL;
 				gchar* _tmp96_ = NULL;
@@ -6055,7 +6057,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 				_directory_monitor_query_info_queue_element_unref0 (next);
 #line 1174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				continue;
-#line 6054 "DirectoryMonitor.c"
+#line 6056 "DirectoryMonitor.c"
 			}
 #line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp104_ = next;
@@ -6063,7 +6065,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 			_tmp105_ = _tmp104_->info;
 #line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp105_ != NULL) {
-#line 6062 "DirectoryMonitor.c"
+#line 6064 "DirectoryMonitor.c"
 				DirectoryMonitorQueryInfoQueueElement* _tmp106_ = NULL;
 				GFileInfo* _tmp107_ = NULL;
 				gboolean _tmp108_ = FALSE;
@@ -6075,15 +6077,15 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 				_tmp108_ = directory_monitor_is_file_symlink_supported (_tmp107_);
 #line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp103_ = !_tmp108_;
-#line 6074 "DirectoryMonitor.c"
+#line 6076 "DirectoryMonitor.c"
 			} else {
 #line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp103_ = FALSE;
-#line 6078 "DirectoryMonitor.c"
+#line 6080 "DirectoryMonitor.c"
 			}
 #line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp103_) {
-#line 6082 "DirectoryMonitor.c"
+#line 6084 "DirectoryMonitor.c"
 				DirectoryMonitorQueryInfoQueueElement* _tmp109_ = NULL;
 				GFile* _tmp110_ = NULL;
 				gchar* _tmp111_ = NULL;
@@ -6123,7 +6125,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 				_directory_monitor_query_info_queue_element_unref0 (next);
 #line 1182 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				continue;
-#line 6122 "DirectoryMonitor.c"
+#line 6124 "DirectoryMonitor.c"
 			}
 #line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp118_ = next;
@@ -6147,7 +6149,7 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
 			_directory_monitor_query_info_queue_element_unref0 (n);
 #line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_directory_monitor_query_info_queue_element_unref0 (next);
-#line 6146 "DirectoryMonitor.c"
+#line 6148 "DirectoryMonitor.c"
 		}
 	}
 }
@@ -6176,7 +6178,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 	_tmp1_ = other_file;
 #line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp1_ != NULL) {
-#line 6175 "DirectoryMonitor.c"
+#line 6177 "DirectoryMonitor.c"
 		GFile* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 #line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6187,7 +6189,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 		_g_free0 (_tmp0_);
 #line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp0_ = _tmp3_;
-#line 6186 "DirectoryMonitor.c"
+#line 6188 "DirectoryMonitor.c"
 	} else {
 		gchar* _tmp4_ = NULL;
 #line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6196,7 +6198,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 		_g_free0 (_tmp0_);
 #line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp0_ = _tmp4_;
-#line 6195 "DirectoryMonitor.c"
+#line 6197 "DirectoryMonitor.c"
 	}
 #line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp5_ = event;
@@ -6224,7 +6226,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 	switch (_tmp12_) {
 #line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_CREATED:
-#line 6223 "DirectoryMonitor.c"
+#line 6225 "DirectoryMonitor.c"
 		{
 			GFileInfo* _tmp13_ = NULL;
 			DirectoryMonitorFType ftype = 0;
@@ -6247,7 +6249,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 			switch (_tmp16_) {
 #line 1201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 6246 "DirectoryMonitor.c"
+#line 6248 "DirectoryMonitor.c"
 				{
 					GFile* _tmp17_ = NULL;
 					GFileInfo* _tmp18_ = NULL;
@@ -6259,11 +6261,11 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					directory_monitor_internal_notify_file_created (self, _tmp17_, _tmp18_);
 #line 1204 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6258 "DirectoryMonitor.c"
+#line 6260 "DirectoryMonitor.c"
 				}
 #line 1201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 6262 "DirectoryMonitor.c"
+#line 6264 "DirectoryMonitor.c"
 				{
 					gint _tmp19_ = 0;
 					GFile* _tmp20_ = NULL;
@@ -6280,7 +6282,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					directory_monitor_explore_async (self, _tmp20_, _tmp21_, FALSE, NULL, NULL);
 #line 1213 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6279 "DirectoryMonitor.c"
+#line 6281 "DirectoryMonitor.c"
 				}
 				default:
 				{
@@ -6291,16 +6293,16 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					_vala_assert (_tmp22_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
 #line 1217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6290 "DirectoryMonitor.c"
+#line 6292 "DirectoryMonitor.c"
 				}
 			}
 #line 1219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 6295 "DirectoryMonitor.c"
+#line 6297 "DirectoryMonitor.c"
 		}
 #line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_CHANGED:
-#line 6299 "DirectoryMonitor.c"
+#line 6301 "DirectoryMonitor.c"
 		{
 			GFileInfo* _tmp23_ = NULL;
 			GFileInfo* local_info = NULL;
@@ -6325,7 +6327,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 			_tmp26_ = local_info;
 #line 1226 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp26_ == NULL) {
-#line 6324 "DirectoryMonitor.c"
+#line 6326 "DirectoryMonitor.c"
 				GFile* _tmp27_ = NULL;
 				gchar* _tmp28_ = NULL;
 				gchar* _tmp29_ = NULL;
@@ -6351,7 +6353,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 				_g_object_unref0 (local_info);
 #line 1229 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				break;
-#line 6350 "DirectoryMonitor.c"
+#line 6352 "DirectoryMonitor.c"
 			}
 #line 1232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp32_ = local_info;
@@ -6365,7 +6367,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 			switch (_tmp34_) {
 #line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 6364 "DirectoryMonitor.c"
+#line 6366 "DirectoryMonitor.c"
 				{
 					GFile* _tmp35_ = NULL;
 #line 1235 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6374,11 +6376,11 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					directory_monitor_notify_file_altered (self, _tmp35_);
 #line 1236 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6373 "DirectoryMonitor.c"
+#line 6375 "DirectoryMonitor.c"
 				}
 #line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 6377 "DirectoryMonitor.c"
+#line 6379 "DirectoryMonitor.c"
 				{
 					GFile* _tmp36_ = NULL;
 #line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6387,7 +6389,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					directory_monitor_notify_directory_altered (self, _tmp36_);
 #line 1240 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6386 "DirectoryMonitor.c"
+#line 6388 "DirectoryMonitor.c"
 				}
 				default:
 				{
@@ -6398,18 +6400,18 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					_vala_assert (_tmp37_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
 #line 1244 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6397 "DirectoryMonitor.c"
+#line 6399 "DirectoryMonitor.c"
 				}
 			}
 #line 1246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (local_info);
 #line 1246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 6404 "DirectoryMonitor.c"
+#line 6406 "DirectoryMonitor.c"
 		}
 #line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
-#line 6408 "DirectoryMonitor.c"
+#line 6410 "DirectoryMonitor.c"
 		{
 			GFileInfo* _tmp38_ = NULL;
 			DirectoryMonitorFType ftype = 0;
@@ -6432,7 +6434,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 			switch (_tmp41_) {
 #line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 6431 "DirectoryMonitor.c"
+#line 6433 "DirectoryMonitor.c"
 				{
 					GFile* _tmp42_ = NULL;
 					GFileInfo* _tmp43_ = NULL;
@@ -6444,11 +6446,11 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					directory_monitor_internal_notify_file_alteration_completed (self, _tmp42_, _tmp43_);
 #line 1255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6443 "DirectoryMonitor.c"
+#line 6445 "DirectoryMonitor.c"
 				}
 #line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 6447 "DirectoryMonitor.c"
+#line 6449 "DirectoryMonitor.c"
 				{
 					GFile* _tmp44_ = NULL;
 					GFileInfo* _tmp45_ = NULL;
@@ -6460,7 +6462,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					directory_monitor_internal_notify_directory_alteration_completed (self, _tmp44_, _tmp45_);
 #line 1259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6459 "DirectoryMonitor.c"
+#line 6461 "DirectoryMonitor.c"
 				}
 				default:
 				{
@@ -6471,16 +6473,16 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					_vala_assert (_tmp46_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
 #line 1263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6470 "DirectoryMonitor.c"
+#line 6472 "DirectoryMonitor.c"
 				}
 			}
 #line 1265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 6475 "DirectoryMonitor.c"
+#line 6477 "DirectoryMonitor.c"
 		}
 #line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_MOVED:
-#line 6479 "DirectoryMonitor.c"
+#line 6481 "DirectoryMonitor.c"
 		{
 			GFileInfo* _tmp47_ = NULL;
 			GFile* _tmp48_ = NULL;
@@ -6508,7 +6510,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 			switch (_tmp51_) {
 #line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 6507 "DirectoryMonitor.c"
+#line 6509 "DirectoryMonitor.c"
 				{
 					GFile* _tmp52_ = NULL;
 					GFile* _tmp53_ = NULL;
@@ -6523,11 +6525,11 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					directory_monitor_internal_notify_file_moved (self, _tmp52_, _tmp53_, _tmp54_);
 #line 1277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6522 "DirectoryMonitor.c"
+#line 6524 "DirectoryMonitor.c"
 				}
 #line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 6526 "DirectoryMonitor.c"
+#line 6528 "DirectoryMonitor.c"
 				{
 					GFileInfo* old_dir_info = NULL;
 					DirectoryMonitorFileInfoMap* _tmp55_ = NULL;
@@ -6550,7 +6552,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					_tmp58_ = old_dir_info;
 #line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					if (_tmp58_ == NULL) {
-#line 6549 "DirectoryMonitor.c"
+#line 6551 "DirectoryMonitor.c"
 						GFile* _tmp59_ = NULL;
 						gchar* _tmp60_ = NULL;
 						gchar* _tmp61_ = NULL;
@@ -6568,7 +6570,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 						_g_object_unref0 (old_dir_info);
 #line 1285 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						break;
-#line 6567 "DirectoryMonitor.c"
+#line 6569 "DirectoryMonitor.c"
 					}
 #line 1288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp62_ = file;
@@ -6584,7 +6586,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					_g_object_unref0 (old_dir_info);
 #line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6583 "DirectoryMonitor.c"
+#line 6585 "DirectoryMonitor.c"
 				}
 				default:
 				{
@@ -6595,16 +6597,16 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					_vala_assert (_tmp66_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
 #line 1293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6594 "DirectoryMonitor.c"
+#line 6596 "DirectoryMonitor.c"
 				}
 			}
 #line 1295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 6599 "DirectoryMonitor.c"
+#line 6601 "DirectoryMonitor.c"
 		}
 #line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_DELETED:
-#line 6603 "DirectoryMonitor.c"
+#line 6605 "DirectoryMonitor.c"
 		{
 			GFileInfo* _tmp67_ = NULL;
 			GFileInfo* local_info = NULL;
@@ -6629,7 +6631,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 			_tmp70_ = local_info;
 #line 1301 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp70_ == NULL) {
-#line 6628 "DirectoryMonitor.c"
+#line 6630 "DirectoryMonitor.c"
 				GFile* _tmp71_ = NULL;
 				gchar* _tmp72_ = NULL;
 				gchar* _tmp73_ = NULL;
@@ -6647,7 +6649,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 				_g_object_unref0 (local_info);
 #line 1304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				break;
-#line 6646 "DirectoryMonitor.c"
+#line 6648 "DirectoryMonitor.c"
 			}
 #line 1307 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp74_ = local_info;
@@ -6661,7 +6663,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 			switch (_tmp76_) {
 #line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 6660 "DirectoryMonitor.c"
+#line 6662 "DirectoryMonitor.c"
 				{
 					GFile* _tmp77_ = NULL;
 #line 1310 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6670,11 +6672,11 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					directory_monitor_internal_notify_file_deleted (self, _tmp77_);
 #line 1311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6669 "DirectoryMonitor.c"
+#line 6671 "DirectoryMonitor.c"
 				}
 #line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 6673 "DirectoryMonitor.c"
+#line 6675 "DirectoryMonitor.c"
 				{
 					GFile* _tmp78_ = NULL;
 #line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6683,7 +6685,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					directory_monitor_internal_notify_directory_deleted (self, _tmp78_);
 #line 1315 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6682 "DirectoryMonitor.c"
+#line 6684 "DirectoryMonitor.c"
 				}
 				default:
 				{
@@ -6694,18 +6696,18 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					_vala_assert (_tmp79_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
 #line 1319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6693 "DirectoryMonitor.c"
+#line 6695 "DirectoryMonitor.c"
 				}
 			}
 #line 1321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (local_info);
 #line 1321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 6700 "DirectoryMonitor.c"
+#line 6702 "DirectoryMonitor.c"
 		}
 #line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
-#line 6704 "DirectoryMonitor.c"
+#line 6706 "DirectoryMonitor.c"
 		{
 			GFileInfo* _tmp80_ = NULL;
 			GFileInfo* local_info = NULL;
@@ -6730,7 +6732,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 			_tmp83_ = local_info;
 #line 1328 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp83_ == NULL) {
-#line 6729 "DirectoryMonitor.c"
+#line 6731 "DirectoryMonitor.c"
 				GFile* _tmp84_ = NULL;
 				gchar* _tmp85_ = NULL;
 				gchar* _tmp86_ = NULL;
@@ -6749,7 +6751,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 				_g_object_unref0 (local_info);
 #line 1331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				break;
-#line 6747 "DirectoryMonitor.c"
+#line 6749 "DirectoryMonitor.c"
 			}
 #line 1334 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp87_ = local_info;
@@ -6763,7 +6765,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 			switch (_tmp89_) {
 #line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 6761 "DirectoryMonitor.c"
+#line 6763 "DirectoryMonitor.c"
 				{
 					GFile* _tmp90_ = NULL;
 #line 1337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6772,11 +6774,11 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					directory_monitor_notify_file_attributes_altered (self, _tmp90_);
 #line 1338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6770 "DirectoryMonitor.c"
+#line 6772 "DirectoryMonitor.c"
 				}
 #line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 6774 "DirectoryMonitor.c"
+#line 6776 "DirectoryMonitor.c"
 				{
 					GFile* _tmp91_ = NULL;
 #line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -6785,7 +6787,7 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					directory_monitor_notify_directory_attributes_altered (self, _tmp91_);
 #line 1342 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6783 "DirectoryMonitor.c"
+#line 6785 "DirectoryMonitor.c"
 				}
 				default:
 				{
@@ -6796,24 +6798,24 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 					_vala_assert (_tmp92_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
 #line 1346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 6794 "DirectoryMonitor.c"
+#line 6796 "DirectoryMonitor.c"
 				}
 			}
 #line 1348 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (local_info);
 #line 1348 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 6801 "DirectoryMonitor.c"
+#line 6803 "DirectoryMonitor.c"
 		}
 #line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
 #line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case G_FILE_MONITOR_EVENT_UNMOUNTED:
-#line 6807 "DirectoryMonitor.c"
+#line 6809 "DirectoryMonitor.c"
 		{
 #line 1353 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 6811 "DirectoryMonitor.c"
+#line 6813 "DirectoryMonitor.c"
 		}
 		default:
 		{
@@ -6827,12 +6829,12 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
 			g_warning ("DirectoryMonitor.vala:1356: Unknown directory monitor event %s", (_tmp94_ != NULL) ? _tmp94_->value_name : NULL);
 #line 1357 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			break;
-#line 6825 "DirectoryMonitor.c"
+#line 6827 "DirectoryMonitor.c"
 		}
 	}
 #line 1189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_free0 (_tmp0_);
-#line 6830 "DirectoryMonitor.c"
+#line 6832 "DirectoryMonitor.c"
 }
 
 
@@ -6863,7 +6865,7 @@ static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, G
 	_tmp3_ = match;
 #line 1367 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp3_ != NULL) {
-#line 6861 "DirectoryMonitor.c"
+#line 6863 "DirectoryMonitor.c"
 		GFile* _tmp4_ = NULL;
 		GFile* _tmp5_ = NULL;
 		DirectoryMonitorFileInfoMap* _tmp6_ = NULL;
@@ -6906,25 +6908,25 @@ static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, G
 		if (old_file) {
 #line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			*old_file = _vala_old_file;
-#line 6904 "DirectoryMonitor.c"
+#line 6906 "DirectoryMonitor.c"
 		} else {
 #line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (_vala_old_file);
-#line 6908 "DirectoryMonitor.c"
+#line 6910 "DirectoryMonitor.c"
 		}
 #line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (old_file_info) {
 #line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			*old_file_info = _vala_old_file_info;
-#line 6914 "DirectoryMonitor.c"
+#line 6916 "DirectoryMonitor.c"
 		} else {
 #line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (_vala_old_file_info);
-#line 6918 "DirectoryMonitor.c"
+#line 6920 "DirectoryMonitor.c"
 		}
 #line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 6922 "DirectoryMonitor.c"
+#line 6924 "DirectoryMonitor.c"
 	}
 #line 1376 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_object_unref0 (_vala_old_file);
@@ -6942,25 +6944,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 6940 "DirectoryMonitor.c"
+#line 6942 "DirectoryMonitor.c"
 	} else {
 #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_vala_old_file);
-#line 6944 "DirectoryMonitor.c"
+#line 6946 "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 6950 "DirectoryMonitor.c"
+#line 6952 "DirectoryMonitor.c"
 	} else {
 #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_vala_old_file_info);
-#line 6954 "DirectoryMonitor.c"
+#line 6956 "DirectoryMonitor.c"
 	}
 #line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 6958 "DirectoryMonitor.c"
+#line 6960 "DirectoryMonitor.c"
 }
 
 
@@ -6982,7 +6984,7 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni
 	any_deleted = FALSE;
 #line 1386 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	any_expired = FALSE;
-#line 6980 "DirectoryMonitor.c"
+#line 6982 "DirectoryMonitor.c"
 	{
 		GeeIterator* _element_it = NULL;
 		GeeQueue* _tmp1_ = NULL;
@@ -6995,7 +6997,7 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni
 		_element_it = _tmp2_;
 #line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		while (TRUE) {
-#line 6993 "DirectoryMonitor.c"
+#line 6995 "DirectoryMonitor.c"
 			GeeIterator* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
 			DirectoryMonitorQueryInfoQueueElement* element = NULL;
@@ -7015,7 +7017,7 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni
 			if (!_tmp4_) {
 #line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				break;
-#line 7013 "DirectoryMonitor.c"
+#line 7015 "DirectoryMonitor.c"
 			}
 #line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp5_ = _element_it;
@@ -7033,7 +7035,7 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni
 				_directory_monitor_query_info_queue_element_unref0 (element);
 #line 1389 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				continue;
-#line 7031 "DirectoryMonitor.c"
+#line 7033 "DirectoryMonitor.c"
 			}
 #line 1391 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			any_deleted = TRUE;
@@ -7049,7 +7051,7 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni
 				_directory_monitor_query_info_queue_element_unref0 (element);
 #line 1394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				continue;
-#line 7047 "DirectoryMonitor.c"
+#line 7049 "DirectoryMonitor.c"
 			}
 #line 1397 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp12_ = element;
@@ -7059,11 +7061,11 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni
 			any_expired = TRUE;
 #line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_directory_monitor_query_info_queue_element_unref0 (element);
-#line 7057 "DirectoryMonitor.c"
+#line 7059 "DirectoryMonitor.c"
 		}
 #line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_element_it);
-#line 7061 "DirectoryMonitor.c"
+#line 7063 "DirectoryMonitor.c"
 	}
 #line 1401 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp13_ = any_expired;
@@ -7071,7 +7073,7 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni
 	if (_tmp13_) {
 #line 1402 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_process_query_queue (self, NULL);
-#line 7069 "DirectoryMonitor.c"
+#line 7071 "DirectoryMonitor.c"
 	}
 #line 1404 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp14_ = any_deleted;
@@ -7079,13 +7081,13 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni
 	if (!_tmp14_) {
 #line 1405 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		self->priv->delete_timer_id = (guint) 0;
-#line 7077 "DirectoryMonitor.c"
+#line 7079 "DirectoryMonitor.c"
 	}
 #line 1407 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	result = any_deleted;
 #line 1407 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 7083 "DirectoryMonitor.c"
+#line 7085 "DirectoryMonitor.c"
 }
 
 
@@ -7108,7 +7110,7 @@ GFileInfo* directory_monitor_get_file_info (DirectoryMonitor* self, GFile* file)
 	result = _tmp2_;
 #line 1412 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 7106 "DirectoryMonitor.c"
+#line 7108 "DirectoryMonitor.c"
 }
 
 
@@ -7126,7 +7128,7 @@ GeeCollection* directory_monitor_get_files (DirectoryMonitor* self) {
 	result = _tmp1_;
 #line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 7124 "DirectoryMonitor.c"
+#line 7126 "DirectoryMonitor.c"
 }
 
 
@@ -7152,7 +7154,7 @@ GFileInfo* directory_monitor_query_file_info (DirectoryMonitor* self, GFile* fil
 	result = _tmp3_;
 #line 1425 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 7150 "DirectoryMonitor.c"
+#line 7152 "DirectoryMonitor.c"
 }
 
 
@@ -7176,7 +7178,7 @@ gboolean directory_monitor_is_file_symlink_supported (GFileInfo* info) {
 		result = TRUE;
 #line 1437 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 7174 "DirectoryMonitor.c"
+#line 7176 "DirectoryMonitor.c"
 	}
 #line 1439 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp2_ = info;
@@ -7190,23 +7192,23 @@ gboolean directory_monitor_is_file_symlink_supported (GFileInfo* info) {
 	switch (_tmp4_) {
 #line 1440 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 7188 "DirectoryMonitor.c"
+#line 7190 "DirectoryMonitor.c"
 		{
 #line 1442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			result = DIRECTORY_MONITOR_SUPPORT_DIR_SYMLINKS;
 #line 1442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			return result;
-#line 7194 "DirectoryMonitor.c"
+#line 7196 "DirectoryMonitor.c"
 		}
 #line 1440 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 7198 "DirectoryMonitor.c"
+#line 7200 "DirectoryMonitor.c"
 		{
 #line 1445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			result = DIRECTORY_MONITOR_SUPPORT_FILE_SYMLINKS;
 #line 1445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			return result;
-#line 7204 "DirectoryMonitor.c"
+#line 7206 "DirectoryMonitor.c"
 		}
 		default:
 		{
@@ -7219,7 +7221,7 @@ gboolean directory_monitor_is_file_symlink_supported (GFileInfo* info) {
 			result = FALSE;
 #line 1450 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			return result;
-#line 7217 "DirectoryMonitor.c"
+#line 7219 "DirectoryMonitor.c"
 		}
 	}
 }
@@ -7232,7 +7234,7 @@ static void directory_monitor_real_root_moved (DirectoryMonitor* self, GFile* ol
 	g_return_if_fail (G_IS_FILE (new_root));
 #line 380 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE_INFO (new_root_info));
-#line 7230 "DirectoryMonitor.c"
+#line 7232 "DirectoryMonitor.c"
 }
 
 
@@ -7251,26 +7253,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 7249 "DirectoryMonitor.c"
+#line 7251 "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 7255 "DirectoryMonitor.c"
+#line 7257 "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 7261 "DirectoryMonitor.c"
+#line 7263 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_root_deleted (DirectoryMonitor* self, GFile* root) {
 #line 388 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (root));
-#line 7268 "DirectoryMonitor.c"
+#line 7270 "DirectoryMonitor.c"
 }
 
 
@@ -7283,7 +7285,7 @@ static void directory_monitor_real_file_discovered (DirectoryMonitor* self, GFil
 	g_return_if_fail (G_IS_FILE (file));
 #line 394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 7281 "DirectoryMonitor.c"
+#line 7283 "DirectoryMonitor.c"
 }
 
 
@@ -7302,19 +7304,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 7300 "DirectoryMonitor.c"
+#line 7302 "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 7306 "DirectoryMonitor.c"
+#line 7308 "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 7312 "DirectoryMonitor.c"
+#line 7314 "DirectoryMonitor.c"
 }
 
 
@@ -7323,14 +7325,14 @@ static void directory_monitor_real_directory_discovered (DirectoryMonitor* self,
 	g_return_if_fail (G_IS_FILE (file));
 #line 397 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 7321 "DirectoryMonitor.c"
+#line 7323 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_discovery_failed (DirectoryMonitor* self, const gchar* reason) {
 #line 402 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (reason != NULL);
-#line 7328 "DirectoryMonitor.c"
+#line 7330 "DirectoryMonitor.c"
 }
 
 
@@ -7339,7 +7341,7 @@ static void directory_monitor_real_discovery_completed (DirectoryMonitor* self)
 	self->priv->has_discovery_started = FALSE;
 #line 407 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	directory_monitor_mdbg ("discovery completed");
-#line 7337 "DirectoryMonitor.c"
+#line 7339 "DirectoryMonitor.c"
 }
 
 
@@ -7348,7 +7350,7 @@ static void directory_monitor_real_file_created (DirectoryMonitor* self, GFile*
 	g_return_if_fail (G_IS_FILE (file));
 #line 410 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 7346 "DirectoryMonitor.c"
+#line 7348 "DirectoryMonitor.c"
 }
 
 
@@ -7359,14 +7361,14 @@ static void directory_monitor_real_file_moved (DirectoryMonitor* self, GFile* ol
 	g_return_if_fail (G_IS_FILE (new_file));
 #line 413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE_INFO (new_file_info));
-#line 7357 "DirectoryMonitor.c"
+#line 7359 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_file_altered (DirectoryMonitor* self, GFile* file) {
 #line 417 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 7364 "DirectoryMonitor.c"
+#line 7366 "DirectoryMonitor.c"
 }
 
 
@@ -7375,21 +7377,21 @@ static void directory_monitor_real_file_alteration_completed (DirectoryMonitor*
 	g_return_if_fail (G_IS_FILE (file));
 #line 422 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 7373 "DirectoryMonitor.c"
+#line 7375 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_file_attributes_altered (DirectoryMonitor* self, GFile* file) {
 #line 425 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 7380 "DirectoryMonitor.c"
+#line 7382 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_file_deleted (DirectoryMonitor* self, GFile* file) {
 #line 428 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 7387 "DirectoryMonitor.c"
+#line 7389 "DirectoryMonitor.c"
 }
 
 
@@ -7398,7 +7400,7 @@ static void directory_monitor_real_directory_created (DirectoryMonitor* self, GF
 	g_return_if_fail (G_IS_FILE (dir));
 #line 432 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 7396 "DirectoryMonitor.c"
+#line 7398 "DirectoryMonitor.c"
 }
 
 
@@ -7409,14 +7411,14 @@ static void directory_monitor_real_directory_moved (DirectoryMonitor* self, GFil
 	g_return_if_fail (G_IS_FILE (new_dir));
 #line 436 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE_INFO (new_dir_info));
-#line 7407 "DirectoryMonitor.c"
+#line 7409 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_directory_altered (DirectoryMonitor* self, GFile* dir) {
 #line 440 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (dir));
-#line 7414 "DirectoryMonitor.c"
+#line 7416 "DirectoryMonitor.c"
 }
 
 
@@ -7425,21 +7427,21 @@ static void directory_monitor_real_directory_alteration_completed (DirectoryMoni
 	g_return_if_fail (G_IS_FILE (dir));
 #line 445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 7423 "DirectoryMonitor.c"
+#line 7425 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_directory_attributes_altered (DirectoryMonitor* self, GFile* dir) {
 #line 448 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (dir));
-#line 7430 "DirectoryMonitor.c"
+#line 7432 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_real_directory_deleted (DirectoryMonitor* self, GFile* dir) {
 #line 452 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (dir));
-#line 7437 "DirectoryMonitor.c"
+#line 7439 "DirectoryMonitor.c"
 }
 
 
@@ -7506,21 +7508,21 @@ static DirectoryMonitorQueryInfoQueueElement* directory_monitor_query_info_queue
 	self->time_created_msec = _tmp8_;
 #line 96 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return self;
-#line 7504 "DirectoryMonitor.c"
+#line 7506 "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 7511 "DirectoryMonitor.c"
+#line 7513 "DirectoryMonitor.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
 #line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 7518 "DirectoryMonitor.c"
+#line 7520 "DirectoryMonitor.c"
 }
 
 
@@ -7542,7 +7544,7 @@ 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 7540 "DirectoryMonitor.c"
+#line 7542 "DirectoryMonitor.c"
 	{
 		GFileInfo* _tmp2_ = NULL;
 		GAsyncResult* _tmp3_ = NULL;
@@ -7556,7 +7558,7 @@ 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 7554 "DirectoryMonitor.c"
+#line 7556 "DirectoryMonitor.c"
 			goto __catch483_g_error;
 		}
 #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7569,7 +7571,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 		self->info = _tmp5_;
 #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_tmp2_);
-#line 7567 "DirectoryMonitor.c"
+#line 7569 "DirectoryMonitor.c"
 	}
 	goto __finally483;
 	__catch483_g_error:
@@ -7591,7 +7593,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 		self->err = _tmp7_;
 #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_error_free0 (err);
-#line 7589 "DirectoryMonitor.c"
+#line 7591 "DirectoryMonitor.c"
 	}
 	__finally483:
 #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7604,7 +7606,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 7602 "DirectoryMonitor.c"
+#line 7604 "DirectoryMonitor.c"
 	}
 #line 117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self->completed = TRUE;
@@ -7614,14 +7616,14 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 	directory_monitor_process_query_queue (_tmp8_, self);
 #line 106 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_object_unref0 (source_file);
-#line 7612 "DirectoryMonitor.c"
+#line 7614 "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 7619 "DirectoryMonitor.c"
+#line 7621 "DirectoryMonitor.c"
 }
 
 
@@ -7630,7 +7632,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 7628 "DirectoryMonitor.c"
+#line 7630 "DirectoryMonitor.c"
 	}
 }
 
@@ -7640,11 +7642,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 7638 "DirectoryMonitor.c"
+#line 7640 "DirectoryMonitor.c"
 	} else {
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 7642 "DirectoryMonitor.c"
+#line 7644 "DirectoryMonitor.c"
 	}
 }
 
@@ -7652,37 +7654,37 @@ 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 7650 "DirectoryMonitor.c"
+#line 7652 "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 7657 "DirectoryMonitor.c"
+#line 7659 "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 7664 "DirectoryMonitor.c"
+#line 7666 "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 7668 "DirectoryMonitor.c"
+#line 7670 "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 7672 "DirectoryMonitor.c"
+#line 7674 "DirectoryMonitor.c"
 	} else {
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 7676 "DirectoryMonitor.c"
+#line 7678 "DirectoryMonitor.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return NULL;
-#line 7680 "DirectoryMonitor.c"
+#line 7682 "DirectoryMonitor.c"
 }
 
 
@@ -7693,25 +7695,25 @@ static gchar* directory_monitor_value_query_info_queue_element_lcopy_value (cons
 	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 7691 "DirectoryMonitor.c"
+#line 7693 "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 7697 "DirectoryMonitor.c"
+#line 7699 "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 7701 "DirectoryMonitor.c"
+#line 7703 "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 7705 "DirectoryMonitor.c"
+#line 7707 "DirectoryMonitor.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return NULL;
-#line 7709 "DirectoryMonitor.c"
+#line 7711 "DirectoryMonitor.c"
 }
 
 
@@ -7725,7 +7727,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 7723 "DirectoryMonitor.c"
+#line 7725 "DirectoryMonitor.c"
 }
 
 
@@ -7734,7 +7736,7 @@ 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 7732 "DirectoryMonitor.c"
+#line 7734 "DirectoryMonitor.c"
 }
 
 
@@ -7754,17 +7756,17 @@ 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 7752 "DirectoryMonitor.c"
+#line 7754 "DirectoryMonitor.c"
 	} else {
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 7756 "DirectoryMonitor.c"
+#line 7758 "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 7762 "DirectoryMonitor.c"
+#line 7764 "DirectoryMonitor.c"
 	}
 }
 
@@ -7783,17 +7785,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 7781 "DirectoryMonitor.c"
+#line 7783 "DirectoryMonitor.c"
 	} else {
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 7785 "DirectoryMonitor.c"
+#line 7787 "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 7791 "DirectoryMonitor.c"
+#line 7793 "DirectoryMonitor.c"
 	}
 }
 
@@ -7803,7 +7805,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 7801 "DirectoryMonitor.c"
+#line 7803 "DirectoryMonitor.c"
 }
 
 
@@ -7816,7 +7818,7 @@ 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 7814 "DirectoryMonitor.c"
+#line 7816 "DirectoryMonitor.c"
 }
 
 
@@ -7836,7 +7838,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 7834 "DirectoryMonitor.c"
+#line 7836 "DirectoryMonitor.c"
 }
 
 
@@ -7861,7 +7863,7 @@ static gpointer directory_monitor_query_info_queue_element_ref (gpointer instanc
 	g_atomic_int_inc (&self->ref_count);
 #line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return instance;
-#line 7859 "DirectoryMonitor.c"
+#line 7861 "DirectoryMonitor.c"
 }
 
 
@@ -7874,7 +7876,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 7872 "DirectoryMonitor.c"
+#line 7874 "DirectoryMonitor.c"
 	}
 }
 
@@ -7885,14 +7887,14 @@ static DirectoryMonitorFileInfoMap* directory_monitor_file_info_map_construct (G
 	self = (DirectoryMonitorFileInfoMap*) g_type_create_instance (object_type);
 #line 134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return self;
-#line 7883 "DirectoryMonitor.c"
+#line 7885 "DirectoryMonitor.c"
 }
 
 
 static DirectoryMonitorFileInfoMap* directory_monitor_file_info_map_new (void) {
 #line 134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return directory_monitor_file_info_map_construct (DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP);
-#line 7890 "DirectoryMonitor.c"
+#line 7892 "DirectoryMonitor.c"
 }
 
 
@@ -7933,7 +7935,7 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor
 	_tmp2_ = local_info;
 #line 141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp2_ == NULL) {
-#line 7931 "DirectoryMonitor.c"
+#line 7933 "DirectoryMonitor.c"
 		GeeHashMap* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
 		gpointer _tmp5_ = NULL;
@@ -7968,25 +7970,25 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor
 			if (normalized) {
 #line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				*normalized = _vala_normalized;
-#line 7966 "DirectoryMonitor.c"
+#line 7968 "DirectoryMonitor.c"
 			} else {
 #line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_g_object_unref0 (_vala_normalized);
-#line 7970 "DirectoryMonitor.c"
+#line 7972 "DirectoryMonitor.c"
 			}
 #line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (id) {
 #line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				*id = _vala_id;
-#line 7976 "DirectoryMonitor.c"
+#line 7978 "DirectoryMonitor.c"
 			} else {
 #line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_g_free0 (_vala_id);
-#line 7980 "DirectoryMonitor.c"
+#line 7982 "DirectoryMonitor.c"
 			}
 #line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			return result;
-#line 7984 "DirectoryMonitor.c"
+#line 7986 "DirectoryMonitor.c"
 		}
 	}
 #line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8017,25 +8019,25 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor
 		if (normalized) {
 #line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			*normalized = _vala_normalized;
-#line 8015 "DirectoryMonitor.c"
+#line 8017 "DirectoryMonitor.c"
 		} else {
 #line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (_vala_normalized);
-#line 8019 "DirectoryMonitor.c"
+#line 8021 "DirectoryMonitor.c"
 		}
 #line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (id) {
 #line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			*id = _vala_id;
-#line 8025 "DirectoryMonitor.c"
+#line 8027 "DirectoryMonitor.c"
 		} else {
 #line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_free0 (_vala_id);
-#line 8029 "DirectoryMonitor.c"
+#line 8031 "DirectoryMonitor.c"
 		}
 #line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8033 "DirectoryMonitor.c"
+#line 8035 "DirectoryMonitor.c"
 	}
 #line 159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp10_ = self->priv->id_map;
@@ -8057,20 +8059,20 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor
 	_tmp16_ = known_file;
 #line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp16_ != NULL) {
-#line 8055 "DirectoryMonitor.c"
+#line 8057 "DirectoryMonitor.c"
 		GFile* _tmp17_ = NULL;
 #line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp17_ = known_file;
 #line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp15_ = _tmp17_;
-#line 8061 "DirectoryMonitor.c"
+#line 8063 "DirectoryMonitor.c"
 	} else {
 		GFile* _tmp18_ = NULL;
 #line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp18_ = file;
 #line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp15_ = _tmp18_;
-#line 8068 "DirectoryMonitor.c"
+#line 8070 "DirectoryMonitor.c"
 	}
 #line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp19_ = _g_object_ref0 (_tmp15_);
@@ -8090,25 +8092,25 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor
 	if (normalized) {
 #line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		*normalized = _vala_normalized;
-#line 8088 "DirectoryMonitor.c"
+#line 8090 "DirectoryMonitor.c"
 	} else {
 #line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_vala_normalized);
-#line 8092 "DirectoryMonitor.c"
+#line 8094 "DirectoryMonitor.c"
 	}
 #line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (id) {
 #line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		*id = _vala_id;
-#line 8098 "DirectoryMonitor.c"
+#line 8100 "DirectoryMonitor.c"
 	} else {
 #line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_free0 (_vala_id);
-#line 8102 "DirectoryMonitor.c"
+#line 8104 "DirectoryMonitor.c"
 	}
 #line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 8106 "DirectoryMonitor.c"
+#line 8108 "DirectoryMonitor.c"
 }
 
 
@@ -8149,7 +8151,7 @@ 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 169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp2_) {
-#line 8147 "DirectoryMonitor.c"
+#line 8149 "DirectoryMonitor.c"
 		gboolean removed = FALSE;
 		GeeHashMap* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
@@ -8167,7 +8169,7 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo
 		_tmp6_ = removed;
 #line 171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_vala_assert (_tmp6_, "removed");
-#line 8165 "DirectoryMonitor.c"
+#line 8167 "DirectoryMonitor.c"
 	}
 #line 175 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp7_ = info;
@@ -8179,7 +8181,7 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo
 	_tmp10_ = existing_id;
 #line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp10_ != NULL) {
-#line 8177 "DirectoryMonitor.c"
+#line 8179 "DirectoryMonitor.c"
 		GeeHashMap* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
 		gboolean _tmp13_ = FALSE;
@@ -8191,15 +8193,15 @@ 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 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp9_ = _tmp13_;
-#line 8189 "DirectoryMonitor.c"
+#line 8191 "DirectoryMonitor.c"
 	} else {
 #line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp9_ = FALSE;
-#line 8193 "DirectoryMonitor.c"
+#line 8195 "DirectoryMonitor.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp9_) {
-#line 8197 "DirectoryMonitor.c"
+#line 8199 "DirectoryMonitor.c"
 		gboolean removed = FALSE;
 		GeeHashMap* _tmp14_ = NULL;
 		const gchar* _tmp15_ = NULL;
@@ -8217,7 +8219,7 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo
 		_tmp17_ = removed;
 #line 178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_vala_assert (_tmp17_, "removed");
-#line 8215 "DirectoryMonitor.c"
+#line 8217 "DirectoryMonitor.c"
 	}
 #line 183 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp18_ = file;
@@ -8245,7 +8247,7 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo
 		_g_free0 (existing_id);
 #line 184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8243 "DirectoryMonitor.c"
+#line 8245 "DirectoryMonitor.c"
 	}
 #line 186 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp23_ = self->priv->map;
@@ -8273,7 +8275,7 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo
 	_g_free0 (existing_id);
 #line 189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 8271 "DirectoryMonitor.c"
+#line 8273 "DirectoryMonitor.c"
 }
 
 
@@ -8320,7 +8322,7 @@ static gboolean directory_monitor_file_info_map_remove (DirectoryMonitorFileInfo
 		_g_free0 (id);
 #line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8318 "DirectoryMonitor.c"
+#line 8320 "DirectoryMonitor.c"
 	}
 #line 198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp5_ = self->priv->map;
@@ -8342,7 +8344,7 @@ static gboolean directory_monitor_file_info_map_remove (DirectoryMonitorFileInfo
 	_g_free0 (id);
 #line 201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 8340 "DirectoryMonitor.c"
+#line 8342 "DirectoryMonitor.c"
 }
 
 
@@ -8351,7 +8353,7 @@ static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfo
 	g_return_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self));
 #line 206 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (files));
-#line 8349 "DirectoryMonitor.c"
+#line 8351 "DirectoryMonitor.c"
 	{
 		GeeIterator* _file_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
@@ -8364,7 +8366,7 @@ static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfo
 		_file_it = _tmp1_;
 #line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		while (TRUE) {
-#line 8362 "DirectoryMonitor.c"
+#line 8364 "DirectoryMonitor.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			GFile* file = NULL;
@@ -8379,7 +8381,7 @@ static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfo
 			if (!_tmp3_) {
 #line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				break;
-#line 8377 "DirectoryMonitor.c"
+#line 8379 "DirectoryMonitor.c"
 			}
 #line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp4_ = _file_it;
@@ -8393,11 +8395,11 @@ static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfo
 			directory_monitor_file_info_map_remove (self, _tmp6_, NULL);
 #line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (file);
-#line 8391 "DirectoryMonitor.c"
+#line 8393 "DirectoryMonitor.c"
 		}
 #line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_file_it);
-#line 8395 "DirectoryMonitor.c"
+#line 8397 "DirectoryMonitor.c"
 	}
 }
 
@@ -8444,7 +8446,7 @@ static gboolean directory_monitor_file_info_map_contains (DirectoryMonitorFileIn
 		_g_free0 (id);
 #line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8442 "DirectoryMonitor.c"
+#line 8444 "DirectoryMonitor.c"
 	}
 #line 217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp5_ = self->priv->id_map;
@@ -8460,7 +8462,7 @@ static gboolean directory_monitor_file_info_map_contains (DirectoryMonitorFileIn
 	_g_free0 (id);
 #line 217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 8458 "DirectoryMonitor.c"
+#line 8460 "DirectoryMonitor.c"
 }
 
 
@@ -8483,7 +8485,7 @@ static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMa
 	_tmp0_ = info;
 #line 222 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp0_ != NULL) {
-#line 8481 "DirectoryMonitor.c"
+#line 8483 "DirectoryMonitor.c"
 		GFileInfo* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 #line 223 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8494,7 +8496,7 @@ static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMa
 		result = _tmp2_;
 #line 223 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8492 "DirectoryMonitor.c"
+#line 8494 "DirectoryMonitor.c"
 	}
 #line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp3_ = file;
@@ -8518,7 +8520,7 @@ static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMa
 		_g_free0 (id);
 #line 228 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8516 "DirectoryMonitor.c"
+#line 8518 "DirectoryMonitor.c"
 	}
 #line 230 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	result = id;
@@ -8526,7 +8528,7 @@ static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMa
 	_g_object_unref0 (normalized);
 #line 230 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 8524 "DirectoryMonitor.c"
+#line 8526 "DirectoryMonitor.c"
 }
 
 
@@ -8540,14 +8542,14 @@ static GeeCollection* directory_monitor_file_info_map_get_all (DirectoryMonitorF
 #line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp0_ = self->priv->map;
 #line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+	_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp2_ = _tmp1_;
 #line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 8545 "DirectoryMonitor.c"
+#line 8547 "DirectoryMonitor.c"
 }
 
 
@@ -8587,7 +8589,7 @@ static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFile
 		result = info;
 #line 241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8585 "DirectoryMonitor.c"
+#line 8587 "DirectoryMonitor.c"
 	}
 #line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp4_ = file;
@@ -8613,7 +8615,7 @@ static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFile
 		_g_object_unref0 (info);
 #line 246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8611 "DirectoryMonitor.c"
+#line 8613 "DirectoryMonitor.c"
 	}
 #line 248 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp8_ = self->priv->map;
@@ -8631,7 +8633,7 @@ static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFile
 	_g_object_unref0 (info);
 #line 248 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 8629 "DirectoryMonitor.c"
+#line 8631 "DirectoryMonitor.c"
 }
 
 
@@ -8677,7 +8679,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		result = info;
 #line 254 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8675 "DirectoryMonitor.c"
+#line 8677 "DirectoryMonitor.c"
 	}
 	{
 		GFileInfo* _tmp3_ = NULL;
@@ -8695,7 +8697,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		_tmp3_ = _tmp6_;
 #line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8693 "DirectoryMonitor.c"
+#line 8695 "DirectoryMonitor.c"
 			goto __catch484_g_error;
 		}
 #line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8708,7 +8710,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		info = _tmp7_;
 #line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_tmp3_);
-#line 8706 "DirectoryMonitor.c"
+#line 8708 "DirectoryMonitor.c"
 	}
 	goto __finally484;
 	__catch484_g_error:
@@ -8745,7 +8747,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		_g_object_unref0 (info);
 #line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8743 "DirectoryMonitor.c"
+#line 8745 "DirectoryMonitor.c"
 	}
 	__finally484:
 #line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8758,7 +8760,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		g_clear_error (&_inner_error_);
 #line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return NULL;
-#line 8756 "DirectoryMonitor.c"
+#line 8758 "DirectoryMonitor.c"
 	}
 #line 266 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp13_ = info;
@@ -8772,7 +8774,7 @@ 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 8770 "DirectoryMonitor.c"
+#line 8772 "DirectoryMonitor.c"
 	}
 #line 269 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp15_ = info;
@@ -8794,7 +8796,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 8792 "DirectoryMonitor.c"
+#line 8794 "DirectoryMonitor.c"
 	}
 #line 273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp19_ = self->priv->id_map;
@@ -8818,7 +8820,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		_g_object_unref0 (info);
 #line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8816 "DirectoryMonitor.c"
+#line 8818 "DirectoryMonitor.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp23_ = self->priv->map;
@@ -8836,7 +8838,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 	_g_object_unref0 (info);
 #line 277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 8834 "DirectoryMonitor.c"
+#line 8836 "DirectoryMonitor.c"
 }
 
 
@@ -8872,7 +8874,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
 		_g_free0 (match_id);
 #line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return result;
-#line 8870 "DirectoryMonitor.c"
+#line 8872 "DirectoryMonitor.c"
 	}
 #line 286 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp3_ = match;
@@ -8886,7 +8888,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
 	g_file_info_get_modification_time (_tmp5_, &_tmp6_);
 #line 287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	match_time = _tmp6_;
-#line 8884 "DirectoryMonitor.c"
+#line 8886 "DirectoryMonitor.c"
 	{
 		GeeIterator* _file_it = NULL;
 		GeeHashMap* _tmp7_ = NULL;
@@ -8898,7 +8900,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
 #line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp7_ = self->priv->map;
 #line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_tmp8_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_MAP, GeeMap));
+		_tmp8_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp9_ = _tmp8_;
 #line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8913,7 +8915,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
 		_file_it = _tmp12_;
 #line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		while (TRUE) {
-#line 8911 "DirectoryMonitor.c"
+#line 8913 "DirectoryMonitor.c"
 			GeeIterator* _tmp13_ = NULL;
 			gboolean _tmp14_ = FALSE;
 			GFile* file = NULL;
@@ -8946,7 +8948,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
 			if (!_tmp14_) {
 #line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				break;
-#line 8944 "DirectoryMonitor.c"
+#line 8946 "DirectoryMonitor.c"
 			}
 #line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp15_ = _file_it;
@@ -8986,7 +8988,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
 				_g_free0 (match_id);
 #line 294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				return result;
-#line 8984 "DirectoryMonitor.c"
+#line 8986 "DirectoryMonitor.c"
 			}
 #line 297 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp25_ = match_size;
@@ -9002,7 +9004,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
 				_g_object_unref0 (file);
 #line 298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				continue;
-#line 9000 "DirectoryMonitor.c"
+#line 9002 "DirectoryMonitor.c"
 			}
 #line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp28_ = info;
@@ -9026,7 +9028,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
 				_g_object_unref0 (file);
 #line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				continue;
-#line 9024 "DirectoryMonitor.c"
+#line 9026 "DirectoryMonitor.c"
 			}
 #line 305 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			result = file;
@@ -9038,11 +9040,11 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
 			_g_free0 (match_id);
 #line 305 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			return result;
-#line 9036 "DirectoryMonitor.c"
+#line 9038 "DirectoryMonitor.c"
 		}
 #line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_file_it);
-#line 9040 "DirectoryMonitor.c"
+#line 9042 "DirectoryMonitor.c"
 	}
 #line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	result = NULL;
@@ -9050,7 +9052,7 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
 	_g_free0 (match_id);
 #line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 9048 "DirectoryMonitor.c"
+#line 9050 "DirectoryMonitor.c"
 }
 
 
@@ -9065,7 +9067,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
 	g_return_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (descendents));
 #line 312 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	pruned = NULL;
-#line 9063 "DirectoryMonitor.c"
+#line 9065 "DirectoryMonitor.c"
 	{
 		GeeIterator* _file_it = NULL;
 		GeeHashMap* _tmp0_ = NULL;
@@ -9077,7 +9079,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
 #line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp0_ = self->priv->map;
 #line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+		_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp2_ = _tmp1_;
 #line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9092,7 +9094,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
 		_file_it = _tmp5_;
 #line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		while (TRUE) {
-#line 9090 "DirectoryMonitor.c"
+#line 9092 "DirectoryMonitor.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			GFile* file = NULL;
@@ -9109,7 +9111,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
 			if (!_tmp7_) {
 #line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				break;
-#line 9107 "DirectoryMonitor.c"
+#line 9109 "DirectoryMonitor.c"
 			}
 #line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp8_ = _file_it;
@@ -9125,7 +9127,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
 			parent = _tmp11_;
 #line 315 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			while (TRUE) {
-#line 9123 "DirectoryMonitor.c"
+#line 9125 "DirectoryMonitor.c"
 				GFile* _tmp12_ = NULL;
 				GFile* _tmp13_ = NULL;
 				GFile* _tmp14_ = NULL;
@@ -9138,7 +9140,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
 				if (!(_tmp12_ != NULL)) {
 #line 315 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 9136 "DirectoryMonitor.c"
+#line 9138 "DirectoryMonitor.c"
 				}
 #line 316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp13_ = parent;
@@ -9148,7 +9150,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
 				_tmp15_ = g_file_equal (_tmp13_, _tmp14_);
 #line 316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				if (_tmp15_) {
-#line 9146 "DirectoryMonitor.c"
+#line 9148 "DirectoryMonitor.c"
 					GeeArrayList* _tmp16_ = NULL;
 					GeeArrayList* _tmp18_ = NULL;
 					GFile* _tmp19_ = NULL;
@@ -9162,15 +9164,15 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
 					_tmp16_ = pruned;
 #line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					if (_tmp16_ == NULL) {
-#line 9160 "DirectoryMonitor.c"
+#line 9162 "DirectoryMonitor.c"
 						GeeArrayList* _tmp17_ = NULL;
 #line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-						_tmp17_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+						_tmp17_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						_g_object_unref0 (pruned);
 #line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 						pruned = _tmp17_;
-#line 9168 "DirectoryMonitor.c"
+#line 9170 "DirectoryMonitor.c"
 					}
 #line 320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_tmp18_ = pruned;
@@ -9196,7 +9198,7 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
 					_g_object_unref0 (_tmp25_);
 #line 323 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 9194 "DirectoryMonitor.c"
+#line 9196 "DirectoryMonitor.c"
 				}
 #line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp26_ = parent;
@@ -9206,33 +9208,33 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
 				_g_object_unref0 (parent);
 #line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				parent = _tmp27_;
-#line 9204 "DirectoryMonitor.c"
+#line 9206 "DirectoryMonitor.c"
 			}
 #line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (parent);
 #line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (file);
-#line 9210 "DirectoryMonitor.c"
+#line 9212 "DirectoryMonitor.c"
 		}
 #line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_file_it);
-#line 9214 "DirectoryMonitor.c"
+#line 9216 "DirectoryMonitor.c"
 	}
 #line 330 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_tmp28_ = pruned;
 #line 330 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (_tmp28_ != NULL) {
-#line 9220 "DirectoryMonitor.c"
+#line 9222 "DirectoryMonitor.c"
 		GeeArrayList* _tmp29_ = NULL;
 #line 331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp29_ = pruned;
 #line 331 "/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 9226 "DirectoryMonitor.c"
+#line 9228 "DirectoryMonitor.c"
 	}
 #line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_object_unref0 (pruned);
-#line 9230 "DirectoryMonitor.c"
+#line 9232 "DirectoryMonitor.c"
 }
 
 
@@ -9249,7 +9251,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
 	g_return_val_if_fail (GEE_IS_COLLECTION (dirs), 0);
 #line 337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	count = 0;
-#line 9247 "DirectoryMonitor.c"
+#line 9249 "DirectoryMonitor.c"
 	{
 		GeeIterator* _file_it = NULL;
 		GeeHashMap* _tmp0_ = NULL;
@@ -9261,7 +9263,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
 #line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp0_ = self->priv->map;
 #line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-		_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+		_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp2_ = _tmp1_;
 #line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9276,7 +9278,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
 		_file_it = _tmp5_;
 #line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		while (TRUE) {
-#line 9274 "DirectoryMonitor.c"
+#line 9276 "DirectoryMonitor.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			GFile* file = NULL;
@@ -9303,7 +9305,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
 			if (!_tmp7_) {
 #line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				break;
-#line 9301 "DirectoryMonitor.c"
+#line 9303 "DirectoryMonitor.c"
 			}
 #line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp8_ = _file_it;
@@ -9323,7 +9325,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
 			if (_tmp13_ == NULL) {
 #line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp12_ = TRUE;
-#line 9321 "DirectoryMonitor.c"
+#line 9323 "DirectoryMonitor.c"
 			} else {
 				GFile* _tmp14_ = NULL;
 				GFile* _tmp15_ = NULL;
@@ -9336,7 +9338,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
 				_tmp16_ = g_file_equal (_tmp14_, _tmp15_);
 #line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_tmp12_ = !_tmp16_;
-#line 9334 "DirectoryMonitor.c"
+#line 9336 "DirectoryMonitor.c"
 			}
 #line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (_tmp12_) {
@@ -9346,7 +9348,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
 				_g_object_unref0 (file);
 #line 341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				continue;
-#line 9344 "DirectoryMonitor.c"
+#line 9346 "DirectoryMonitor.c"
 			}
 #line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_tmp17_ = self->priv->map;
@@ -9370,7 +9372,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
 			switch (_tmp23_) {
 #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 9368 "DirectoryMonitor.c"
+#line 9370 "DirectoryMonitor.c"
 				{
 					GeeCollection* _tmp24_ = NULL;
 					GFile* _tmp25_ = NULL;
@@ -9387,11 +9389,11 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
 					count = _tmp26_ + 1;
 #line 348 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 9385 "DirectoryMonitor.c"
+#line 9387 "DirectoryMonitor.c"
 				}
 #line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 9389 "DirectoryMonitor.c"
+#line 9391 "DirectoryMonitor.c"
 				{
 					GeeCollection* _tmp27_ = NULL;
 					GFile* _tmp28_ = NULL;
@@ -9408,7 +9410,7 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
 					count = _tmp29_ + 1;
 #line 353 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 9406 "DirectoryMonitor.c"
+#line 9408 "DirectoryMonitor.c"
 				}
 				default:
 				{
@@ -9419,31 +9421,31 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
 					_vala_assert (_tmp30_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
 #line 357 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					break;
-#line 9417 "DirectoryMonitor.c"
+#line 9419 "DirectoryMonitor.c"
 				}
 			}
 #line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (parent);
 #line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_g_object_unref0 (file);
-#line 9424 "DirectoryMonitor.c"
+#line 9426 "DirectoryMonitor.c"
 		}
 #line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_g_object_unref0 (_file_it);
-#line 9428 "DirectoryMonitor.c"
+#line 9430 "DirectoryMonitor.c"
 	}
 #line 361 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	result = count;
 #line 361 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return result;
-#line 9434 "DirectoryMonitor.c"
+#line 9436 "DirectoryMonitor.c"
 }
 
 
 static void directory_monitor_value_file_info_map_init (GValue* value) {
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	value->data[0].v_pointer = NULL;
-#line 9441 "DirectoryMonitor.c"
+#line 9443 "DirectoryMonitor.c"
 }
 
 
@@ -9452,7 +9454,7 @@ static void directory_monitor_value_file_info_map_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_file_info_map_unref (value->data[0].v_pointer);
-#line 9450 "DirectoryMonitor.c"
+#line 9452 "DirectoryMonitor.c"
 	}
 }
 
@@ -9462,11 +9464,11 @@ static void directory_monitor_value_file_info_map_copy_value (const GValue* src_
 	if (src_value->data[0].v_pointer) {
 #line 128 "/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 9460 "DirectoryMonitor.c"
+#line 9462 "DirectoryMonitor.c"
 	} else {
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9464 "DirectoryMonitor.c"
+#line 9466 "DirectoryMonitor.c"
 	}
 }
 
@@ -9474,37 +9476,37 @@ 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 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return value->data[0].v_pointer;
-#line 9472 "DirectoryMonitor.c"
+#line 9474 "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 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (collect_values[0].v_pointer) {
-#line 9479 "DirectoryMonitor.c"
+#line 9481 "DirectoryMonitor.c"
 		DirectoryMonitorFileInfoMap* object;
 		object = collect_values[0].v_pointer;
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9486 "DirectoryMonitor.c"
+#line 9488 "DirectoryMonitor.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 128 "/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 9490 "DirectoryMonitor.c"
+#line 9492 "DirectoryMonitor.c"
 		}
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		value->data[0].v_pointer = directory_monitor_file_info_map_ref (object);
-#line 9494 "DirectoryMonitor.c"
+#line 9496 "DirectoryMonitor.c"
 	} else {
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 9498 "DirectoryMonitor.c"
+#line 9500 "DirectoryMonitor.c"
 	}
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return NULL;
-#line 9502 "DirectoryMonitor.c"
+#line 9504 "DirectoryMonitor.c"
 }
 
 
@@ -9515,25 +9517,25 @@ static gchar* directory_monitor_value_file_info_map_lcopy_value (const GValue* v
 	if (!object_p) {
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9513 "DirectoryMonitor.c"
+#line 9515 "DirectoryMonitor.c"
 	}
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (!value->data[0].v_pointer) {
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		*object_p = NULL;
-#line 9519 "DirectoryMonitor.c"
+#line 9521 "DirectoryMonitor.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9523 "DirectoryMonitor.c"
+#line 9525 "DirectoryMonitor.c"
 	} else {
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		*object_p = directory_monitor_file_info_map_ref (value->data[0].v_pointer);
-#line 9527 "DirectoryMonitor.c"
+#line 9529 "DirectoryMonitor.c"
 	}
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return NULL;
-#line 9531 "DirectoryMonitor.c"
+#line 9533 "DirectoryMonitor.c"
 }
 
 
@@ -9547,7 +9549,7 @@ static GParamSpec* directory_monitor_param_spec_file_info_map (const gchar* name
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return G_PARAM_SPEC (spec);
-#line 9545 "DirectoryMonitor.c"
+#line 9547 "DirectoryMonitor.c"
 }
 
 
@@ -9556,7 +9558,7 @@ 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 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return value->data[0].v_pointer;
-#line 9554 "DirectoryMonitor.c"
+#line 9556 "DirectoryMonitor.c"
 }
 
 
@@ -9576,17 +9578,17 @@ static void directory_monitor_value_set_file_info_map (GValue* value, gpointer v
 		value->data[0].v_pointer = v_object;
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_file_info_map_ref (value->data[0].v_pointer);
-#line 9574 "DirectoryMonitor.c"
+#line 9576 "DirectoryMonitor.c"
 	} else {
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 9578 "DirectoryMonitor.c"
+#line 9580 "DirectoryMonitor.c"
 	}
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (old) {
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_file_info_map_unref (old);
-#line 9584 "DirectoryMonitor.c"
+#line 9586 "DirectoryMonitor.c"
 	}
 }
 
@@ -9605,17 +9607,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 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		value->data[0].v_pointer = v_object;
-#line 9603 "DirectoryMonitor.c"
+#line 9605 "DirectoryMonitor.c"
 	} else {
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 9607 "DirectoryMonitor.c"
+#line 9609 "DirectoryMonitor.c"
 	}
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (old) {
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		directory_monitor_file_info_map_unref (old);
-#line 9613 "DirectoryMonitor.c"
+#line 9615 "DirectoryMonitor.c"
 	}
 }
 
@@ -9627,7 +9629,7 @@ static void directory_monitor_file_info_map_class_init (DirectoryMonitorFileInfo
 	((DirectoryMonitorFileInfoMapClass *) klass)->finalize = directory_monitor_file_info_map_finalize;
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	g_type_class_add_private (klass, sizeof (DirectoryMonitorFileInfoMapPrivate));
-#line 9625 "DirectoryMonitor.c"
+#line 9627 "DirectoryMonitor.c"
 }
 
 
@@ -9637,16 +9639,16 @@ static void directory_monitor_file_info_map_instance_init (DirectoryMonitorFileI
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self->priv = DIRECTORY_MONITOR_FILE_INFO_MAP_GET_PRIVATE (self);
 #line 129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = 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 129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self->priv->map = _tmp0_;
 #line 131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+	_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self->priv->id_map = _tmp1_;
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self->ref_count = 1;
-#line 9644 "DirectoryMonitor.c"
+#line 9646 "DirectoryMonitor.c"
 }
 
 
@@ -9660,7 +9662,7 @@ static void directory_monitor_file_info_map_finalize (DirectoryMonitorFileInfoMa
 	_g_object_unref0 (self->priv->map);
 #line 131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	_g_object_unref0 (self->priv->id_map);
-#line 9658 "DirectoryMonitor.c"
+#line 9660 "DirectoryMonitor.c"
 }
 
 
@@ -9685,7 +9687,7 @@ static gpointer directory_monitor_file_info_map_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	return instance;
-#line 9683 "DirectoryMonitor.c"
+#line 9685 "DirectoryMonitor.c"
 }
 
 
@@ -9698,7 +9700,7 @@ static void directory_monitor_file_info_map_unref (gpointer instance) {
 		DIRECTORY_MONITOR_FILE_INFO_MAP_GET_CLASS (self)->finalize (self);
 #line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9696 "DirectoryMonitor.c"
+#line 9698 "DirectoryMonitor.c"
 	}
 }
 
@@ -9709,51 +9711,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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -9836,7 +9838,7 @@ static void directory_monitor_class_init (DirectoryMonitorClass * klass) {
 	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 9834 "DirectoryMonitor.c"
+#line 9836 "DirectoryMonitor.c"
 }
 
 
@@ -9849,11 +9851,11 @@ static void directory_monitor_instance_init (DirectoryMonitor * self) {
 #line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self->priv = DIRECTORY_MONITOR_GET_PRIVATE (self);
 #line 368 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, g_file_monitor_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, g_file_monitor_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 368 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self->priv->monitors = _tmp0_;
 #line 369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
-	_tmp1_ = gee_linked_list_new (DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT, (GBoxedCopyFunc) directory_monitor_query_info_queue_element_ref, directory_monitor_query_info_queue_element_unref, NULL, NULL, NULL);
+	_tmp1_ = gee_linked_list_new (DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT, (GBoxedCopyFunc) directory_monitor_query_info_queue_element_ref, (GDestroyNotify) directory_monitor_query_info_queue_element_unref, NULL, NULL, NULL);
 #line 369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self->priv->query_info_queue = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_QUEUE, GeeQueue);
 #line 371 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -9876,7 +9878,7 @@ static void directory_monitor_instance_init (DirectoryMonitor * self) {
 	self->priv->has_discovery_started = FALSE;
 #line 377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	self->priv->delete_timer_id = (guint) 0;
-#line 9874 "DirectoryMonitor.c"
+#line 9876 "DirectoryMonitor.c"
 }
 
 
@@ -9898,7 +9900,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 9896 "DirectoryMonitor.c"
+#line 9898 "DirectoryMonitor.c"
 }
 
 
diff --git a/src/Event.c b/src/Event.c
index af882ab..9f49ff5 100644
--- a/src/Event.c
+++ b/src/Event.c
@@ -1,4 +1,4 @@
-/* Event.c generated by valac 0.34.4, the Vala compiler
+/* Event.c generated by valac 0.34.7, the Vala compiler
  * generated from Event.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1494,7 +1494,7 @@ static GeeCollection* event_source_collection_real_get_containers_holding_source
 #line 1495 "Event.c"
 	}
 #line 63 "/home/jens/Source/shotwell/src/Event.vala"
-	_tmp3_ = gee_array_list_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp3_ = gee_array_list_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 63 "/home/jens/Source/shotwell/src/Event.vala"
 	list = _tmp3_;
 #line 64 "/home/jens/Source/shotwell/src/Event.vala"
@@ -1753,9 +1753,9 @@ 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 = 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 = event_source_collection_no_event_view_manager_real_create_view;
+	((ViewManagerClass *) klass)->create_view = (DataView* (*)(ViewManager*, DataSource*)) event_source_collection_no_event_view_manager_real_create_view;
 #line 1760 "Event.c"
 }
 
@@ -1784,11 +1784,11 @@ 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 = 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 = 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 = 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"
@@ -1989,7 +1989,7 @@ static Event* event_construct (GType object_type, EventRow* event_row, gint64 ob
 #line 190 "/home/jens/Source/shotwell/src/Event.vala"
 	event_source_ids = _tmp17_;
 #line 192 "/home/jens/Source/shotwell/src/Event.vala"
-	_tmp18_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
@@ -2120,7 +2120,7 @@ static Event* event_construct (GType object_type, EventRow* event_row, gint64 ob
 #line 206 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp47_ = event_thumbs;
 #line 206 "/home/jens/Source/shotwell/src/Event.vala"
-	_tmp48_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp48_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 206 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp49_ = _tmp48_;
 #line 206 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2474,11 +2474,11 @@ void event_init (ProgressMonitor monitor, void* monitor_target) {
 #line 272 "/home/jens/Source/shotwell/src/Event.vala"
 	event_source_collection_init (_tmp2_);
 #line 275 "/home/jens/Source/shotwell/src/Event.vala"
-	_tmp3_ = gee_array_list_new (TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp3_ = gee_array_list_new (TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 275 "/home/jens/Source/shotwell/src/Event.vala"
 	events = _tmp3_;
 #line 276 "/home/jens/Source/shotwell/src/Event.vala"
-	_tmp4_ = gee_array_list_new (TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp4_ = gee_array_list_new (TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 276 "/home/jens/Source/shotwell/src/Event.vala"
 	unlinked = _tmp4_;
 #line 278 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2490,7 +2490,7 @@ void event_init (ProgressMonitor monitor, void* monitor_target) {
 #line 279 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp7_ = event_rows;
 #line 279 "/home/jens/Source/shotwell/src/Event.vala"
-	_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 279 "/home/jens/Source/shotwell/src/Event.vala"
 	_tmp9_ = _tmp8_;
 #line 279 "/home/jens/Source/shotwell/src/Event.vala"
@@ -2769,7 +2769,7 @@ void event_attach_many (Event* self, GeeCollection* media) {
 #line 331 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media));
 #line 332 "/home/jens/Source/shotwell/src/Event.vala"
-	_tmp0_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
@@ -2899,7 +2899,7 @@ void event_detach_many (Event* self, GeeCollection* media) {
 #line 346 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media));
 #line 347 "/home/jens/Source/shotwell/src/Event.vala"
-	_tmp0_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
@@ -3098,7 +3098,7 @@ static GeeArrayList* event_views_to_media (Event* self, GeeIterable* views) {
 #line 369 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_val_if_fail (GEE_IS_ITERABLE (views), NULL);
 #line 370 "/home/jens/Source/shotwell/src/Event.vala"
-	_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
@@ -3272,7 +3272,7 @@ static void event_on_media_removed (Event* self, GeeIterable* removed) {
 #line 393 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp10_ = _current_source_list;
 #line 393 "/home/jens/Source/shotwell/src/Event.vala"
-		_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 393 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp12_ = _tmp11_;
 #line 393 "/home/jens/Source/shotwell/src/Event.vala"
@@ -3993,11 +3993,11 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 #line 519 "/home/jens/Source/shotwell/src/Event.vala"
 	self->priv->unlinking = TRUE;
 #line 521 "/home/jens/Source/shotwell/src/Event.vala"
-	_tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 521 "/home/jens/Source/shotwell/src/Event.vala"
 	photos = _tmp0_;
 #line 522 "/home/jens/Source/shotwell/src/Event.vala"
-	_tmp1_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp1_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 522 "/home/jens/Source/shotwell/src/Event.vala"
 	videos = _tmp1_;
 #line 523 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4171,11 +4171,11 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 #line 549 "/home/jens/Source/shotwell/src/Event.vala"
 	self->priv->relinking = TRUE;
 #line 551 "/home/jens/Source/shotwell/src/Event.vala"
-	_tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 551 "/home/jens/Source/shotwell/src/Event.vala"
 	photos = _tmp0_;
 #line 552 "/home/jens/Source/shotwell/src/Event.vala"
-	_tmp1_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp1_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 552 "/home/jens/Source/shotwell/src/Event.vala"
 	videos = _tmp1_;
 #line 553 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5521,7 +5521,7 @@ void event_generate_many_events (GeeCollection* sources, ViewCollection* events_
 #line 692 "/home/jens/Source/shotwell/src/Event.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (events_so_far));
 #line 693 "/home/jens/Source/shotwell/src/Event.vala"
-	_tmp0_ = gee_array_list_new (TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
@@ -7295,7 +7295,7 @@ 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 = event_event_snapshot_real_notify_broken;
+	((SourceSnapshotClass *) klass)->notify_broken = (void (*)(SourceSnapshot*)) event_event_snapshot_real_notify_broken;
 #line 7299 "Event.c"
 }
 
@@ -7305,7 +7305,7 @@ static void event_event_snapshot_instance_init (EventEventSnapshot * self) {
 #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, g_object_unref, NULL, NULL, NULL);
+	_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"
@@ -7434,7 +7434,7 @@ 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 = event_event_proxy_real_reconstitute;
+	((SourceProxyClass *) klass)->reconstitute = (DataSource* (*)(SourceProxy*, gint64, SourceSnapshot*)) event_event_proxy_real_reconstitute;
 #line 7438 "Event.c"
 }
 
@@ -7461,43 +7461,43 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
diff --git a/src/Exporter.c b/src/Exporter.c
index bc4c3b1..60a528c 100644
--- a/src/Exporter.c
+++ b/src/Exporter.c
@@ -1,4 +1,4 @@
-/* Exporter.c generated by valac 0.34.4, the Vala compiler
+/* Exporter.c generated by valac 0.34.7, the Vala compiler
  * generated from Exporter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 _tmp89_ = 0;
+	gint _tmp90_ = 0;
 	GError * _inner_error_ = NULL;
 #line 194 "/home/jens/Source/shotwell/src/Exporter.vala"
 	g_return_val_if_fail (IS_EXPORTER (self), FALSE);
@@ -1247,21 +1247,21 @@ static gboolean exporter_process_queue (Exporter* self) {
 			GFile* _tmp34_ = NULL;
 			GFile* dest = NULL;
 			GFile* _tmp35_ = NULL;
-			Workers* _tmp74_ = NULL;
-			MediaSource* _tmp75_ = NULL;
-			GFile* _tmp76_ = NULL;
-			Scaling _tmp77_ = {0};
-			ExportFormatParameters _tmp78_ = {0};
-			JpegQuality _tmp79_ = 0;
-			PhotoFileFormat _tmp80_ = 0;
-			GCancellable* _tmp81_ = NULL;
-			ExportFormatParameters _tmp82_ = {0};
-			ExportFormatMode _tmp83_ = 0;
-			ExportFormatParameters _tmp84_ = {0};
-			gboolean _tmp85_ = FALSE;
-			ExporterExportJob* _tmp86_ = 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;
-			gint _tmp88_ = 0;
+			ExporterExportJob* _tmp88_ = NULL;
+			gint _tmp89_ = 0;
 #line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
 			_tmp2_ = _source_it;
 #line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1559,6 +1559,8 @@ static gboolean exporter_process_queue (Exporter* self) {
 				__finally478:
 #line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1563 "Exporter.c"
+					gboolean _tmp54_ = FALSE;
 #line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
 					_g_object_unref0 (dest);
 #line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1576,88 +1578,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 FALSE;
-#line 1581 "Exporter.c"
+					return _tmp54_;
+#line 1583 "Exporter.c"
 				}
 			} else {
-				GFile* _tmp54_ = NULL;
-				const gchar* _tmp55_ = NULL;
-				GFile* _tmp56_ = NULL;
-				gboolean _tmp57_ = FALSE;
+				GFile* _tmp55_ = NULL;
+				const gchar* _tmp56_ = NULL;
+				GFile* _tmp57_ = NULL;
 				gboolean _tmp58_ = FALSE;
+				gboolean _tmp59_ = FALSE;
 #line 238 "/home/jens/Source/shotwell/src/Exporter.vala"
-				_tmp54_ = self->priv->dir;
+				_tmp55_ = self->priv->dir;
 #line 238 "/home/jens/Source/shotwell/src/Exporter.vala"
-				_tmp55_ = basename;
+				_tmp56_ = basename;
 #line 238 "/home/jens/Source/shotwell/src/Exporter.vala"
-				_tmp56_ = g_file_get_child (_tmp54_, _tmp55_);
+				_tmp57_ = g_file_get_child (_tmp55_, _tmp56_);
 #line 238 "/home/jens/Source/shotwell/src/Exporter.vala"
 				_g_object_unref0 (dest);
 #line 238 "/home/jens/Source/shotwell/src/Exporter.vala"
-				dest = _tmp56_;
+				dest = _tmp57_;
 #line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
-				_tmp58_ = self->priv->replace_all;
+				_tmp59_ = self->priv->replace_all;
 #line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
-				if (!_tmp58_) {
-#line 1603 "Exporter.c"
-					GFile* _tmp59_ = NULL;
-					gboolean _tmp60_ = FALSE;
+				if (!_tmp59_) {
+#line 1605 "Exporter.c"
+					GFile* _tmp60_ = NULL;
+					gboolean _tmp61_ = FALSE;
 #line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp59_ = dest;
+					_tmp60_ = dest;
 #line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp60_ = g_file_query_exists (_tmp59_, NULL);
+					_tmp61_ = g_file_query_exists (_tmp60_, NULL);
 #line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp57_ = _tmp60_;
-#line 1612 "Exporter.c"
+					_tmp58_ = _tmp61_;
+#line 1614 "Exporter.c"
 				} else {
 #line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp57_ = FALSE;
-#line 1616 "Exporter.c"
+					_tmp58_ = FALSE;
+#line 1618 "Exporter.c"
 				}
 #line 240 "/home/jens/Source/shotwell/src/Exporter.vala"
-				if (_tmp57_) {
-#line 1620 "Exporter.c"
-					ExporterOverwriteCallback _tmp61_ = NULL;
-					void* _tmp61__target = NULL;
-					GFile* _tmp62_ = NULL;
-					ExporterOverwrite _tmp63_ = 0;
+				if (_tmp58_) {
+#line 1622 "Exporter.c"
+					ExporterOverwriteCallback _tmp62_ = NULL;
+					void* _tmp62__target = NULL;
+					GFile* _tmp63_ = NULL;
+					ExporterOverwrite _tmp64_ = 0;
 #line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp61_ = self->priv->overwrite_callback;
+					_tmp62_ = self->priv->overwrite_callback;
 #line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp61__target = self->priv->overwrite_callback_target;
+					_tmp62__target = self->priv->overwrite_callback_target;
 #line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp62_ = dest;
+					_tmp63_ = dest;
 #line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
-					_tmp63_ = _tmp61_ (self, _tmp62_, _tmp61__target);
+					_tmp64_ = _tmp62_ (self, _tmp63_, _tmp62__target);
 #line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
-					switch (_tmp63_) {
+					switch (_tmp64_) {
 #line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
 						case EXPORTER_OVERWRITE_YES:
-#line 1637 "Exporter.c"
+#line 1639 "Exporter.c"
 						{
 #line 244 "/home/jens/Source/shotwell/src/Exporter.vala"
 							break;
-#line 1641 "Exporter.c"
+#line 1643 "Exporter.c"
 						}
 #line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
 						case EXPORTER_OVERWRITE_REPLACE_ALL:
-#line 1645 "Exporter.c"
+#line 1647 "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 1651 "Exporter.c"
+#line 1653 "Exporter.c"
 						}
 #line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
 						case EXPORTER_OVERWRITE_CANCEL:
-#line 1655 "Exporter.c"
+#line 1657 "Exporter.c"
 						{
-							GCancellable* _tmp64_ = NULL;
+							GCancellable* _tmp65_ = NULL;
 #line 251 "/home/jens/Source/shotwell/src/Exporter.vala"
-							_tmp64_ = self->priv->cancellable;
+							_tmp65_ = self->priv->cancellable;
 #line 251 "/home/jens/Source/shotwell/src/Exporter.vala"
-							g_cancellable_cancel (_tmp64_);
+							g_cancellable_cancel (_tmp65_);
 #line 253 "/home/jens/Source/shotwell/src/Exporter.vala"
 							result = FALSE;
 #line 253 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1674,56 +1676,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 1678 "Exporter.c"
+#line 1680 "Exporter.c"
 						}
 						default:
 #line 241 "/home/jens/Source/shotwell/src/Exporter.vala"
 						case EXPORTER_OVERWRITE_NO:
-#line 1683 "Exporter.c"
+#line 1685 "Exporter.c"
 						{
-							gint _tmp65_ = 0;
-							ProgressMonitor _tmp66_ = NULL;
-							void* _tmp66__target = NULL;
+							gint _tmp66_ = 0;
+							ProgressMonitor _tmp67_ = NULL;
+							void* _tmp67__target = NULL;
 #line 257 "/home/jens/Source/shotwell/src/Exporter.vala"
-							_tmp65_ = self->priv->completed_count;
+							_tmp66_ = self->priv->completed_count;
 #line 257 "/home/jens/Source/shotwell/src/Exporter.vala"
-							self->priv->completed_count = _tmp65_ + 1;
+							self->priv->completed_count = _tmp66_ + 1;
 #line 258 "/home/jens/Source/shotwell/src/Exporter.vala"
-							_tmp66_ = self->priv->monitor;
+							_tmp67_ = self->priv->monitor;
 #line 258 "/home/jens/Source/shotwell/src/Exporter.vala"
-							_tmp66__target = self->priv->monitor_target;
+							_tmp67__target = self->priv->monitor_target;
 #line 258 "/home/jens/Source/shotwell/src/Exporter.vala"
-							if (_tmp66_ != NULL) {
-#line 1698 "Exporter.c"
-								ProgressMonitor _tmp67_ = NULL;
-								void* _tmp67__target = NULL;
-								gint _tmp68_ = 0;
-								GeeCollection* _tmp69_ = NULL;
-								gint _tmp70_ = 0;
+							if (_tmp67_ != NULL) {
+#line 1700 "Exporter.c"
+								ProgressMonitor _tmp68_ = NULL;
+								void* _tmp68__target = NULL;
+								gint _tmp69_ = 0;
+								GeeCollection* _tmp70_ = NULL;
 								gint _tmp71_ = 0;
-								gboolean _tmp72_ = FALSE;
+								gint _tmp72_ = 0;
+								gboolean _tmp73_ = FALSE;
 #line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
-								_tmp67_ = self->priv->monitor;
+								_tmp68_ = self->priv->monitor;
 #line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
-								_tmp67__target = self->priv->monitor_target;
+								_tmp68__target = self->priv->monitor_target;
 #line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
-								_tmp68_ = self->priv->completed_count;
+								_tmp69_ = self->priv->completed_count;
 #line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
-								_tmp69_ = self->priv->to_export;
+								_tmp70_ = self->priv->to_export;
 #line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
-								_tmp70_ = gee_collection_get_size (_tmp69_);
+								_tmp71_ = gee_collection_get_size (_tmp70_);
 #line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
-								_tmp71_ = _tmp70_;
+								_tmp72_ = _tmp71_;
 #line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
-								_tmp72_ = _tmp67_ ((guint64) _tmp68_, (guint64) _tmp71_, TRUE, _tmp67__target);
+								_tmp73_ = _tmp68_ ((guint64) _tmp69_, (guint64) _tmp72_, TRUE, _tmp68__target);
 #line 259 "/home/jens/Source/shotwell/src/Exporter.vala"
-								if (!_tmp72_) {
-#line 1722 "Exporter.c"
-									GCancellable* _tmp73_ = NULL;
+								if (!_tmp73_) {
+#line 1724 "Exporter.c"
+									GCancellable* _tmp74_ = NULL;
 #line 260 "/home/jens/Source/shotwell/src/Exporter.vala"
-									_tmp73_ = self->priv->cancellable;
+									_tmp74_ = self->priv->cancellable;
 #line 260 "/home/jens/Source/shotwell/src/Exporter.vala"
-									g_cancellable_cancel (_tmp73_);
+									g_cancellable_cancel (_tmp74_);
 #line 262 "/home/jens/Source/shotwell/src/Exporter.vala"
 									result = FALSE;
 #line 262 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1740,52 +1742,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 1744 "Exporter.c"
+#line 1746 "Exporter.c"
 								}
 							}
 #line 266 "/home/jens/Source/shotwell/src/Exporter.vala"
 							continue;
-#line 1749 "Exporter.c"
+#line 1751 "Exporter.c"
 						}
 					}
 				}
 			}
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp74_ = self->priv->workers;
+			_tmp75_ = self->priv->workers;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp75_ = source;
+			_tmp76_ = source;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp76_ = dest;
+			_tmp77_ = dest;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp77_ = self->priv->scaling;
+			_tmp78_ = self->priv->scaling;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp78_ = self->priv->export_params;
+			_tmp79_ = self->priv->export_params;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp79_ = _tmp78_.quality;
+			_tmp80_ = _tmp79_.quality;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp80_ = real_export_format;
+			_tmp81_ = real_export_format;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp81_ = self->priv->cancellable;
+			_tmp82_ = self->priv->cancellable;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp82_ = self->priv->export_params;
+			_tmp83_ = self->priv->export_params;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp83_ = _tmp82_.mode;
+			_tmp84_ = _tmp83_.mode;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp84_ = self->priv->export_params;
+			_tmp85_ = self->priv->export_params;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp85_ = _tmp84_.export_metadata;
+			_tmp86_ = _tmp85_.export_metadata;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp86_ = exporter_export_job_new (self, _tmp75_, _tmp76_, &_tmp77_, &_tmp79_, &_tmp80_, _tmp81_, _tmp83_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp85_);
+			_tmp87_ = exporter_export_job_new (self, _tmp76_, _tmp77_, &_tmp78_, &_tmp80_, &_tmp81_, _tmp82_, _tmp84_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp86_);
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp87_ = _tmp86_;
+			_tmp88_ = _tmp87_;
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			workers_enqueue (_tmp74_, G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, TYPE_BACKGROUND_JOB, BackgroundJob));
+			workers_enqueue (_tmp75_, G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 271 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_background_job_unref0 (_tmp87_);
+			_background_job_unref0 (_tmp88_);
 #line 273 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_tmp88_ = submitted;
+			_tmp89_ = submitted;
 #line 273 "/home/jens/Source/shotwell/src/Exporter.vala"
-			submitted = _tmp88_ + 1;
+			submitted = _tmp89_ + 1;
 #line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
 			_g_object_unref0 (dest);
 #line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1796,19 +1798,19 @@ 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 1800 "Exporter.c"
+#line 1802 "Exporter.c"
 		}
 #line 196 "/home/jens/Source/shotwell/src/Exporter.vala"
 		_g_object_unref0 (_source_it);
-#line 1804 "Exporter.c"
+#line 1806 "Exporter.c"
 	}
 #line 276 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp89_ = submitted;
+	_tmp90_ = submitted;
 #line 276 "/home/jens/Source/shotwell/src/Exporter.vala"
-	result = _tmp89_ > 0;
+	result = _tmp90_ > 0;
 #line 276 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return result;
-#line 1812 "Exporter.c"
+#line 1814 "Exporter.c"
 }
 
 
@@ -1826,28 +1828,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 1830 "Exporter.c"
+#line 1832 "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 1837 "Exporter.c"
+#line 1839 "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 1844 "Exporter.c"
+#line 1846 "Exporter.c"
 }
 
 
 static gpointer _scaling_dup0 (gpointer self) {
 #line 87 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return self ? scaling_dup (self) : NULL;
-#line 1851 "Exporter.c"
+#line 1853 "Exporter.c"
 }
 
 
@@ -1859,14 +1861,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 1863 "Exporter.c"
+#line 1865 "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 1870 "Exporter.c"
+#line 1872 "Exporter.c"
 }
 
 
@@ -1878,14 +1880,14 @@ 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 1882 "Exporter.c"
+#line 1884 "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 1889 "Exporter.c"
+#line 1891 "Exporter.c"
 }
 
 
@@ -1933,14 +1935,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 1937 "Exporter.c"
+#line 1939 "Exporter.c"
 	} else {
 		MediaSource* _tmp6_ = NULL;
 #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 1944 "Exporter.c"
+#line 1946 "Exporter.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_vala_assert (_tmp4_, "media is Photo || media is Video");
@@ -1994,21 +1996,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 1998 "Exporter.c"
+#line 2000 "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 2005 "Exporter.c"
+#line 2007 "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 2012 "Exporter.c"
+#line 2014 "Exporter.c"
 }
 
 
@@ -2017,14 +2019,14 @@ 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 2021 "Exporter.c"
+#line 2023 "Exporter.c"
 	{
 		MediaSource* _tmp0_ = NULL;
 #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 2028 "Exporter.c"
+#line 2030 "Exporter.c"
 			MediaSource* _tmp1_ = NULL;
 			GFile* _tmp2_ = NULL;
 			Scaling* _tmp3_ = NULL;
@@ -2053,7 +2055,7 @@ 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 2057 "Exporter.c"
+#line 2059 "Exporter.c"
 				goto __catch479_g_error;
 			}
 		} else {
@@ -2062,7 +2064,7 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
 			_tmp9_ = self->media;
 #line 98 "/home/jens/Source/shotwell/src/Exporter.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_VIDEO)) {
-#line 2066 "Exporter.c"
+#line 2068 "Exporter.c"
 				MediaSource* _tmp10_ = NULL;
 				GFile* _tmp11_ = NULL;
 #line 99 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2073,7 +2075,7 @@ 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 2077 "Exporter.c"
+#line 2079 "Exporter.c"
 					goto __catch479_g_error;
 				}
 			}
@@ -2099,7 +2101,7 @@ 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 2103 "Exporter.c"
+#line 2105 "Exporter.c"
 	}
 	__finally479:
 #line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2110,7 +2112,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 2114 "Exporter.c"
+#line 2116 "Exporter.c"
 	}
 }
 
@@ -2121,8 +2123,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 = exporter_export_job_real_execute;
-#line 2126 "Exporter.c"
+	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) exporter_export_job_real_execute;
+#line 2128 "Exporter.c"
 }
 
 
@@ -2133,7 +2135,7 @@ 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 2137 "Exporter.c"
+#line 2139 "Exporter.c"
 }
 
 
@@ -2155,7 +2157,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 2159 "Exporter.c"
+#line 2161 "Exporter.c"
 }
 
 
@@ -2178,7 +2180,7 @@ 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 2182 "Exporter.c"
+#line 2184 "Exporter.c"
 }
 
 
@@ -2189,7 +2191,7 @@ static void exporter_instance_init (Exporter * self) {
 #line 53 "/home/jens/Source/shotwell/src/Exporter.vala"
 	self->priv = EXPORTER_GET_PRIVATE (self);
 #line 107 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 107 "/home/jens/Source/shotwell/src/Exporter.vala"
 	self->priv->to_export = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 111 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2212,7 +2214,7 @@ static void exporter_instance_init (Exporter * self) {
 	self->priv->replace_all = FALSE;
 #line 119 "/home/jens/Source/shotwell/src/Exporter.vala"
 	self->priv->aborted = FALSE;
-#line 2216 "Exporter.c"
+#line 2218 "Exporter.c"
 }
 
 
@@ -2232,7 +2234,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 2236 "Exporter.c"
+#line 2238 "Exporter.c"
 }
 
 
@@ -2266,21 +2268,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 2270 "Exporter.c"
+#line 2272 "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 2277 "Exporter.c"
+#line 2279 "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 2284 "Exporter.c"
+#line 2286 "Exporter.c"
 }
 
 
@@ -2289,7 +2291,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 2293 "Exporter.c"
+#line 2295 "Exporter.c"
 }
 
 
@@ -2298,7 +2300,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 2302 "Exporter.c"
+#line 2304 "Exporter.c"
 }
 
 
@@ -2307,7 +2309,7 @@ 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 2311 "Exporter.c"
+#line 2313 "Exporter.c"
 }
 
 
@@ -2368,7 +2370,7 @@ void exporter_ui_export (ExporterUI* self, ExporterCompletionCallback completion
 	_tmp10_ = 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 2372 "Exporter.c"
+#line 2374 "Exporter.c"
 }
 
 
@@ -2388,7 +2390,7 @@ 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 2392 "Exporter.c"
+#line 2394 "Exporter.c"
 		ProgressDialog* _tmp1_ = NULL;
 #line 306 "/home/jens/Source/shotwell/src/Exporter.vala"
 		_tmp1_ = self->priv->progress_dialog;
@@ -2398,7 +2400,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 2402 "Exporter.c"
+#line 2404 "Exporter.c"
 	}
 #line 310 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_tmp2_ = app_window_get_instance ();
@@ -2418,7 +2420,7 @@ 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 2422 "Exporter.c"
+#line 2424 "Exporter.c"
 }
 
 
@@ -2491,7 +2493,7 @@ static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Expo
 	switch (_tmp14_) {
 #line 323 "/home/jens/Source/shotwell/src/Exporter.vala"
 		case GTK_RESPONSE_APPLY:
-#line 2495 "Exporter.c"
+#line 2497 "Exporter.c"
 		{
 #line 325 "/home/jens/Source/shotwell/src/Exporter.vala"
 			result = EXPORTER_OVERWRITE_REPLACE_ALL;
@@ -2499,11 +2501,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 2503 "Exporter.c"
+#line 2505 "Exporter.c"
 		}
 #line 323 "/home/jens/Source/shotwell/src/Exporter.vala"
 		case GTK_RESPONSE_YES:
-#line 2507 "Exporter.c"
+#line 2509 "Exporter.c"
 		{
 #line 328 "/home/jens/Source/shotwell/src/Exporter.vala"
 			result = EXPORTER_OVERWRITE_YES;
@@ -2511,11 +2513,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 2515 "Exporter.c"
+#line 2517 "Exporter.c"
 		}
 #line 323 "/home/jens/Source/shotwell/src/Exporter.vala"
 		case GTK_RESPONSE_CANCEL:
-#line 2519 "Exporter.c"
+#line 2521 "Exporter.c"
 		{
 #line 331 "/home/jens/Source/shotwell/src/Exporter.vala"
 			result = EXPORTER_OVERWRITE_CANCEL;
@@ -2523,12 +2525,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 2527 "Exporter.c"
+#line 2529 "Exporter.c"
 		}
 		default:
 #line 323 "/home/jens/Source/shotwell/src/Exporter.vala"
 		case GTK_RESPONSE_NO:
-#line 2532 "Exporter.c"
+#line 2534 "Exporter.c"
 		{
 #line 335 "/home/jens/Source/shotwell/src/Exporter.vala"
 			result = EXPORTER_OVERWRITE_NO;
@@ -2536,12 +2538,12 @@ 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 2540 "Exporter.c"
+#line 2542 "Exporter.c"
 		}
 	}
 #line 315 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_g_free0 (question);
-#line 2545 "Exporter.c"
+#line 2547 "Exporter.c"
 }
 
 
@@ -2566,14 +2568,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 2570 "Exporter.c"
+#line 2572 "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 2577 "Exporter.c"
+#line 2579 "Exporter.c"
 }
 
 
@@ -2582,7 +2584,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 2586 "Exporter.c"
+#line 2588 "Exporter.c"
 	}
 }
 
@@ -2592,11 +2594,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 2596 "Exporter.c"
+#line 2598 "Exporter.c"
 	} else {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2600 "Exporter.c"
+#line 2602 "Exporter.c"
 	}
 }
 
@@ -2604,37 +2606,37 @@ 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 2608 "Exporter.c"
+#line 2610 "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 2615 "Exporter.c"
+#line 2617 "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 2622 "Exporter.c"
+#line 2624 "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 2626 "Exporter.c"
+#line 2628 "Exporter.c"
 		}
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		value->data[0].v_pointer = exporter_ui_ref (object);
-#line 2630 "Exporter.c"
+#line 2632 "Exporter.c"
 	} else {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		value->data[0].v_pointer = NULL;
-#line 2634 "Exporter.c"
+#line 2636 "Exporter.c"
 	}
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return NULL;
-#line 2638 "Exporter.c"
+#line 2640 "Exporter.c"
 }
 
 
@@ -2645,25 +2647,25 @@ static gchar* value_exporter_ui_lcopy_value (const GValue* value, guint n_collec
 	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 2649 "Exporter.c"
+#line 2651 "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 2655 "Exporter.c"
+#line 2657 "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 2659 "Exporter.c"
+#line 2661 "Exporter.c"
 	} else {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		*object_p = exporter_ui_ref (value->data[0].v_pointer);
-#line 2663 "Exporter.c"
+#line 2665 "Exporter.c"
 	}
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return NULL;
-#line 2667 "Exporter.c"
+#line 2669 "Exporter.c"
 }
 
 
@@ -2677,7 +2679,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 2681 "Exporter.c"
+#line 2683 "Exporter.c"
 }
 
 
@@ -2686,7 +2688,7 @@ 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 2690 "Exporter.c"
+#line 2692 "Exporter.c"
 }
 
 
@@ -2706,17 +2708,17 @@ 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 2710 "Exporter.c"
+#line 2712 "Exporter.c"
 	} else {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		value->data[0].v_pointer = NULL;
-#line 2714 "Exporter.c"
+#line 2716 "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 2720 "Exporter.c"
+#line 2722 "Exporter.c"
 	}
 }
 
@@ -2735,17 +2737,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 2739 "Exporter.c"
+#line 2741 "Exporter.c"
 	} else {
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 		value->data[0].v_pointer = NULL;
-#line 2743 "Exporter.c"
+#line 2745 "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 2749 "Exporter.c"
+#line 2751 "Exporter.c"
 	}
 }
 
@@ -2757,7 +2759,7 @@ 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 2761 "Exporter.c"
+#line 2763 "Exporter.c"
 }
 
 
@@ -2775,7 +2777,7 @@ static void exporter_ui_instance_init (ExporterUI * self) {
 	self->priv->completion_callback = NULL;
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	self->ref_count = 1;
-#line 2779 "Exporter.c"
+#line 2781 "Exporter.c"
 }
 
 
@@ -2791,7 +2793,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 2795 "Exporter.c"
+#line 2797 "Exporter.c"
 }
 
 
@@ -2816,7 +2818,7 @@ gpointer exporter_ui_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 284 "/home/jens/Source/shotwell/src/Exporter.vala"
 	return instance;
-#line 2820 "Exporter.c"
+#line 2822 "Exporter.c"
 }
 
 
@@ -2829,7 +2831,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 2833 "Exporter.c"
+#line 2835 "Exporter.c"
 	}
 }
 
diff --git a/src/International.c b/src/International.c
index b4f2b43..f651a32 100644
--- a/src/International.c
+++ b/src/International.c
@@ -1,4 +1,4 @@
-/* International.c generated by valac 0.34.4, the Vala compiler
+/* International.c generated by valac 0.34.7, the Vala compiler
  * generated from International.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/LibraryFiles.c b/src/LibraryFiles.c
index 12b77b8..0932f18 100644
--- a/src/LibraryFiles.c
+++ b/src/LibraryFiles.c
@@ -1,4 +1,4 @@
-/* LibraryFiles.c generated by valac 0.34.4, the Vala compiler
+/* LibraryFiles.c generated by valac 0.34.7, the Vala compiler
  * generated from LibraryFiles.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/LibraryMonitor.c b/src/LibraryMonitor.c
index 8f36753..a1234fb 100644
--- a/src/LibraryMonitor.c
+++ b/src/LibraryMonitor.c
@@ -1,4 +1,4 @@
-/* LibraryMonitor.c generated by valac 0.34.4, the Vala compiler
+/* LibraryMonitor.c generated by valac 0.34.7, the Vala compiler
  * generated from LibraryMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1941,7 +1941,7 @@ static void library_monitor_add_to_discovered_list (LibraryMonitor* self, MediaM
 #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp4_ = monitor;
 #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-		_tmp5_ = gee_hash_set_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+		_tmp5_ = gee_hash_set_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp6_ = _tmp5_;
 #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2245,13 +2245,13 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) {
 #line 2246 "LibraryMonitor.c"
 	}
 #line 287 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_tmp28_ = gee_hash_map_new (TYPE_MEDIA_MONITOR, (GBoxedCopyFunc) g_object_ref, g_object_unref, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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);
 #line 287 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (self->priv->discovered);
 #line 287 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->priv->discovered = _tmp28_;
 #line 288 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_tmp29_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+	_tmp29_ = 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 288 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (self->priv->unknown_files);
 #line 288 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2590,7 +2590,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 #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_COLLECTION, GeeCollection));
+	_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"
@@ -2618,13 +2618,13 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 #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, g_object_unref, NULL, NULL, NULL);
+	_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, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
+	_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"
@@ -2875,7 +2875,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 #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_COLLECTION, GeeCollection));
+			_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"
@@ -2895,7 +2895,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 #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, g_object_unref, NULL, NULL, NULL);
+				_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"
@@ -4590,7 +4590,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 #line 573 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp2_ = self->priv->import_queue;
 #line 573 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 573 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp4_ = _tmp3_;
 #line 573 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4614,7 +4614,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp6_ = self->priv->import_queue;
 #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp8_ = _tmp7_;
 #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4664,7 +4664,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 #line 589 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->priv->last_import_roll_use = _tmp17_;
 #line 591 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_tmp18_ = gee_array_list_new (TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL);
+	_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"
@@ -4834,7 +4834,7 @@ static void library_monitor_schedule_next_batch_import (LibraryMonitor* self) {
 #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp2_ = self->priv->batch_import_queue;
 #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp4_ = _tmp3_;
 #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4934,7 +4934,7 @@ static void library_monitor_discard_current_batch_import (LibraryMonitor* self)
 #line 639 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp11_ = self->priv->batch_import_queue;
 #line 639 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 639 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp13_ = _tmp12_;
 #line 639 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4981,7 +4981,7 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) {
 #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp1_ = self->priv->batch_import_queue;
 #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-		_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp3_ = _tmp2_;
 #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5232,7 +5232,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 		GeeArrayList* to_tombstone = NULL;
 		GeeArrayList* _tmp29_ = NULL;
 #line 687 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-		_tmp29_ = gee_array_list_new (TYPE_TOMBSTONED_FILE, (GBoxedCopyFunc) tombstoned_file_ref, tombstoned_file_unref, NULL, NULL, NULL);
+		_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"
@@ -5434,7 +5434,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp59_ = self->priv->pending_imports;
 #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_tmp60_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp60_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp61_ = _tmp60_;
 #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5704,11 +5704,12 @@ gboolean library_monitor_is_blacklisted (GFile* file) {
 #line 5705 "LibraryMonitor.c"
 	{
 		GeeHashSet* _tmp0_ = NULL;
+		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 5712 "LibraryMonitor.c"
+#line 5713 "LibraryMonitor.c"
 		{
 			GeeHashSet* _tmp1_ = NULL;
 			GFile* _tmp2_ = NULL;
@@ -5721,18 +5722,18 @@ 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 5725 "LibraryMonitor.c"
+#line 5726 "LibraryMonitor.c"
 			{
 				GeeHashSet* _tmp4_ = NULL;
 #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 5732 "LibraryMonitor.c"
+#line 5733 "LibraryMonitor.c"
 			}
 #line 755 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			return result;
-#line 5736 "LibraryMonitor.c"
+#line 5737 "LibraryMonitor.c"
 		}
 		__finally490:
 		{
@@ -5741,15 +5742,15 @@ gboolean library_monitor_is_blacklisted (GFile* file) {
 			_tmp5_ = library_monitor_blacklist;
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			g_rec_mutex_unlock (&__lock_library_monitor_blacklist);
-#line 5745 "LibraryMonitor.c"
+#line 5746 "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);
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_clear_error (&_inner_error_);
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-		return FALSE;
-#line 5753 "LibraryMonitor.c"
+		return _tmp6_;
+#line 5754 "LibraryMonitor.c"
 	}
 }
 
@@ -5786,7 +5787,7 @@ static gboolean library_monitor_is_supported_filetype (LibraryMonitor* self, GFi
 	result = _tmp5_;
 #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 5790 "LibraryMonitor.c"
+#line 5791 "LibraryMonitor.c"
 }
 
 
@@ -5802,11 +5803,11 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 	if (!_tmp0_) {
 #line 767 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 5806 "LibraryMonitor.c"
+#line 5807 "LibraryMonitor.c"
 	}
 #line 769 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	to_import = NULL;
-#line 5810 "LibraryMonitor.c"
+#line 5811 "LibraryMonitor.c"
 	{
 		GeeIterator* _file_it = NULL;
 		GeeCollection* _tmp1_ = NULL;
@@ -5827,7 +5828,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 		_file_it = _tmp4_;
 #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 5831 "LibraryMonitor.c"
+#line 5832 "LibraryMonitor.c"
 			GeeIterator* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
 			GFile* file = NULL;
@@ -5859,7 +5860,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 			if (!_tmp6_) {
 #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 5863 "LibraryMonitor.c"
+#line 5864 "LibraryMonitor.c"
 			}
 #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp7_ = _file_it;
@@ -5879,7 +5880,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 			if (_tmp12_ == NULL) {
 #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp11_ = TRUE;
-#line 5883 "LibraryMonitor.c"
+#line 5884 "LibraryMonitor.c"
 			} else {
 				GFileInfo* _tmp13_ = NULL;
 				GFileType _tmp14_ = 0;
@@ -5889,7 +5890,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 				_tmp14_ = g_file_info_get_file_type (_tmp13_);
 #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp11_ = _tmp14_ != G_FILE_TYPE_REGULAR;
-#line 5893 "LibraryMonitor.c"
+#line 5894 "LibraryMonitor.c"
 			}
 #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_tmp11_) {
@@ -5899,7 +5900,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 5903 "LibraryMonitor.c"
+#line 5904 "LibraryMonitor.c"
 			}
 #line 775 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp15_ = self->priv->pending_imports;
@@ -5915,7 +5916,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 5919 "LibraryMonitor.c"
+#line 5920 "LibraryMonitor.c"
 			}
 #line 778 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp18_ = tombstone_global;
@@ -5931,11 +5932,11 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 				_g_object_unref0 (file);
 #line 779 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				continue;
-#line 5935 "LibraryMonitor.c"
+#line 5936 "LibraryMonitor.c"
 			}
 #line 781 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			represented = FALSE;
-#line 5939 "LibraryMonitor.c"
+#line 5940 "LibraryMonitor.c"
 			{
 				GeeList* _monitor_list = NULL;
 				GeeList* _tmp21_ = NULL;
@@ -5963,7 +5964,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 				_monitor_index = -1;
 #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				while (TRUE) {
-#line 5967 "LibraryMonitor.c"
+#line 5968 "LibraryMonitor.c"
 					gint _tmp26_ = 0;
 					gint _tmp27_ = 0;
 					gint _tmp28_ = 0;
@@ -5986,7 +5987,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 					if (!(_tmp27_ < _tmp28_)) {
 #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						break;
-#line 5990 "LibraryMonitor.c"
+#line 5991 "LibraryMonitor.c"
 					}
 #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp29_ = _monitor_list;
@@ -6010,15 +6011,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 6014 "LibraryMonitor.c"
+#line 6015 "LibraryMonitor.c"
 					}
 #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_g_object_unref0 (monitor);
-#line 6018 "LibraryMonitor.c"
+#line 6019 "LibraryMonitor.c"
 				}
 #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (_monitor_list);
-#line 6022 "LibraryMonitor.c"
+#line 6023 "LibraryMonitor.c"
 			}
 #line 790 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp35_ = represented;
@@ -6030,7 +6031,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 6034 "LibraryMonitor.c"
+#line 6035 "LibraryMonitor.c"
 			}
 #line 793 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp36_ = file;
@@ -6044,21 +6045,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 6048 "LibraryMonitor.c"
+#line 6049 "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 6054 "LibraryMonitor.c"
+#line 6055 "LibraryMonitor.c"
 				GeeArrayList* _tmp39_ = NULL;
 #line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-				_tmp39_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
+				_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 6062 "LibraryMonitor.c"
+#line 6063 "LibraryMonitor.c"
 			}
 #line 799 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp40_ = to_import;
@@ -6070,27 +6071,27 @@ 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 6074 "LibraryMonitor.c"
+#line 6075 "LibraryMonitor.c"
 		}
 #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_file_it);
-#line 6078 "LibraryMonitor.c"
+#line 6079 "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 6084 "LibraryMonitor.c"
+#line 6085 "LibraryMonitor.c"
 		GeeArrayList* _tmp43_ = NULL;
 #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 6090 "LibraryMonitor.c"
+#line 6091 "LibraryMonitor.c"
 	}
 #line 765 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (to_import);
-#line 6094 "LibraryMonitor.c"
+#line 6095 "LibraryMonitor.c"
 }
 
 
@@ -6106,7 +6107,7 @@ 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 6110 "LibraryMonitor.c"
+#line 6111 "LibraryMonitor.c"
 		GFile* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6115,15 +6116,15 @@ static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* sel
 		_tmp4_ = library_monitor_is_supported_filetype (self, _tmp3_);
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp1_ = _tmp4_;
-#line 6119 "LibraryMonitor.c"
+#line 6120 "LibraryMonitor.c"
 	} else {
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp1_ = FALSE;
-#line 6123 "LibraryMonitor.c"
+#line 6124 "LibraryMonitor.c"
 	}
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp1_) {
-#line 6127 "LibraryMonitor.c"
+#line 6128 "LibraryMonitor.c"
 		TombstoneSourceCollection* _tmp5_ = NULL;
 		GFile* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
@@ -6135,15 +6136,15 @@ 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 6139 "LibraryMonitor.c"
+#line 6140 "LibraryMonitor.c"
 	} else {
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = FALSE;
-#line 6143 "LibraryMonitor.c"
+#line 6144 "LibraryMonitor.c"
 	}
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp0_) {
-#line 6147 "LibraryMonitor.c"
+#line 6148 "LibraryMonitor.c"
 		GFile* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
@@ -6170,7 +6171,7 @@ 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 6174 "LibraryMonitor.c"
+#line 6175 "LibraryMonitor.c"
 	}
 }
 
@@ -6196,7 +6197,7 @@ 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 6200 "LibraryMonitor.c"
+#line 6201 "LibraryMonitor.c"
 		GFile* _tmp2_ = NULL;
 		GFileInfo* _tmp3_ = NULL;
 #line 817 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6207,11 +6208,11 @@ 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 6211 "LibraryMonitor.c"
+#line 6212 "LibraryMonitor.c"
 	}
 #line 822 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	known = FALSE;
-#line 6215 "LibraryMonitor.c"
+#line 6216 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
 		GeeList* _tmp4_ = NULL;
@@ -6239,7 +6240,7 @@ 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 6243 "LibraryMonitor.c"
+#line 6244 "LibraryMonitor.c"
 			gint _tmp9_ = 0;
 			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
@@ -6263,7 +6264,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 6267 "LibraryMonitor.c"
+#line 6268 "LibraryMonitor.c"
 			}
 #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp12_ = _monitor_list;
@@ -6289,28 +6290,28 @@ 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 6293 "LibraryMonitor.c"
+#line 6294 "LibraryMonitor.c"
 			}
 #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 6297 "LibraryMonitor.c"
+#line 6298 "LibraryMonitor.c"
 		}
 #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 6301 "LibraryMonitor.c"
+#line 6302 "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 6307 "LibraryMonitor.c"
+#line 6308 "LibraryMonitor.c"
 		GeeHashSet* all_candidates = NULL;
 		gboolean _tmp78_ = FALSE;
 		gboolean _tmp79_ = FALSE;
 		gboolean _tmp80_ = FALSE;
 #line 833 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		all_candidates = NULL;
-#line 6314 "LibraryMonitor.c"
+#line 6315 "LibraryMonitor.c"
 		{
 			GeeList* _monitor_list = NULL;
 			GeeList* _tmp20_ = NULL;
@@ -6338,7 +6339,7 @@ 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 6342 "LibraryMonitor.c"
+#line 6343 "LibraryMonitor.c"
 				gint _tmp25_ = 0;
 				gint _tmp26_ = 0;
 				gint _tmp27_ = 0;
@@ -6367,7 +6368,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 6371 "LibraryMonitor.c"
+#line 6372 "LibraryMonitor.c"
 				}
 #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp28_ = _monitor_list;
@@ -6395,18 +6396,18 @@ 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 6399 "LibraryMonitor.c"
+#line 6400 "LibraryMonitor.c"
 				} else {
 					MediaMonitorDiscoveredFile _tmp38_ = 0;
 #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 6406 "LibraryMonitor.c"
+#line 6407 "LibraryMonitor.c"
 				}
 #line 838 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				if (_tmp36_) {
-#line 6410 "LibraryMonitor.c"
+#line 6411 "LibraryMonitor.c"
 					MediaMonitor* _tmp39_ = NULL;
 					gchar* _tmp40_ = NULL;
 					gchar* _tmp41_ = NULL;
@@ -6453,7 +6454,7 @@ 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 6457 "LibraryMonitor.c"
+#line 6458 "LibraryMonitor.c"
 				} else {
 					gboolean _tmp49_ = FALSE;
 					GeeCollection* _tmp50_ = NULL;
@@ -6461,7 +6462,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 					_tmp50_ = candidates;
 #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (_tmp50_ != NULL) {
-#line 6465 "LibraryMonitor.c"
+#line 6466 "LibraryMonitor.c"
 						GeeCollection* _tmp51_ = NULL;
 						gint _tmp52_ = 0;
 						gint _tmp53_ = 0;
@@ -6473,15 +6474,15 @@ 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 6477 "LibraryMonitor.c"
+#line 6478 "LibraryMonitor.c"
 					} else {
 #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_tmp49_ = FALSE;
-#line 6481 "LibraryMonitor.c"
+#line 6482 "LibraryMonitor.c"
 					}
 #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (_tmp49_) {
-#line 6485 "LibraryMonitor.c"
+#line 6486 "LibraryMonitor.c"
 						MediaMonitor* _tmp54_ = NULL;
 						gchar* _tmp55_ = NULL;
 						gchar* _tmp56_ = NULL;
@@ -6528,15 +6529,15 @@ 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 6532 "LibraryMonitor.c"
+#line 6533 "LibraryMonitor.c"
 							GeeHashSet* _tmp66_ = NULL;
 #line 851 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-							_tmp66_ = gee_hash_set_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+							_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 6540 "LibraryMonitor.c"
+#line 6541 "LibraryMonitor.c"
 						}
 						{
 							GeeIterator* _candidate_it = NULL;
@@ -6550,7 +6551,7 @@ 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 6554 "LibraryMonitor.c"
+#line 6555 "LibraryMonitor.c"
 								GeeIterator* _tmp69_ = NULL;
 								gboolean _tmp70_ = FALSE;
 								Monitorable* candidate = NULL;
@@ -6567,7 +6568,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 6571 "LibraryMonitor.c"
+#line 6572 "LibraryMonitor.c"
 								}
 #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 								_tmp71_ = _candidate_it;
@@ -6583,7 +6584,7 @@ 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 6587 "LibraryMonitor.c"
+#line 6588 "LibraryMonitor.c"
 									GeeHashSet* _tmp76_ = NULL;
 									Monitorable* _tmp77_ = NULL;
 #line 855 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6592,15 +6593,15 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 									_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 6596 "LibraryMonitor.c"
+#line 6597 "LibraryMonitor.c"
 								}
 #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 								_g_object_unref0 (candidate);
-#line 6600 "LibraryMonitor.c"
+#line 6601 "LibraryMonitor.c"
 							}
 #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							_g_object_unref0 (_candidate_it);
-#line 6604 "LibraryMonitor.c"
+#line 6605 "LibraryMonitor.c"
 						}
 					}
 				}
@@ -6608,51 +6609,51 @@ 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 6612 "LibraryMonitor.c"
+#line 6613 "LibraryMonitor.c"
 			}
 #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (_monitor_list);
-#line 6616 "LibraryMonitor.c"
+#line 6617 "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 6622 "LibraryMonitor.c"
+#line 6623 "LibraryMonitor.c"
 			GeeHashSet* _tmp81_ = NULL;
 #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 6628 "LibraryMonitor.c"
+#line 6629 "LibraryMonitor.c"
 		} else {
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp79_ = FALSE;
-#line 6632 "LibraryMonitor.c"
+#line 6633 "LibraryMonitor.c"
 		}
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (_tmp79_) {
-#line 6636 "LibraryMonitor.c"
+#line 6637 "LibraryMonitor.c"
 			GeeHashSet* _tmp82_ = NULL;
 			gint _tmp83_ = 0;
 			gint _tmp84_ = 0;
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp82_ = all_candidates;
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-			_tmp83_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp83_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp84_ = _tmp83_;
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp78_ = _tmp84_ > 0;
-#line 6648 "LibraryMonitor.c"
+#line 6649 "LibraryMonitor.c"
 		} else {
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp78_ = FALSE;
-#line 6652 "LibraryMonitor.c"
+#line 6653 "LibraryMonitor.c"
 		}
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (_tmp78_) {
-#line 6656 "LibraryMonitor.c"
+#line 6657 "LibraryMonitor.c"
 			GeeHashSet* _tmp85_ = NULL;
 			gint _tmp86_ = 0;
 			gint _tmp87_ = 0;
@@ -6669,7 +6670,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp85_ = all_candidates;
 #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-			_tmp86_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp86_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp87_ = _tmp86_;
 #line 861 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6704,23 +6705,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 6708 "LibraryMonitor.c"
+#line 6709 "LibraryMonitor.c"
 		}
 #line 831 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (all_candidates);
-#line 6712 "LibraryMonitor.c"
+#line 6713 "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 6718 "LibraryMonitor.c"
+#line 6719 "LibraryMonitor.c"
 		GFile* _tmp99_ = NULL;
 #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 6724 "LibraryMonitor.c"
+#line 6725 "LibraryMonitor.c"
 	}
 #line 873 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp100_ = file;
@@ -6728,7 +6729,7 @@ 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 6732 "LibraryMonitor.c"
+#line 6733 "LibraryMonitor.c"
 }
 
 
@@ -6756,7 +6757,7 @@ 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 6760 "LibraryMonitor.c"
+#line 6761 "LibraryMonitor.c"
 		LibraryMonitorRuntimeFindMoveJob* _tmp4_ = NULL;
 		GFile* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -6783,7 +6784,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 6786 "LibraryMonitor.c"
+#line 6787 "LibraryMonitor.c"
 	}
 #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp11_ = job;
@@ -6791,7 +6792,7 @@ 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 6794 "LibraryMonitor.c"
+#line 6795 "LibraryMonitor.c"
 		MediaMonitor* monitor = NULL;
 		LibraryMonitorRuntimeFindMoveJob* _tmp13_ = NULL;
 		Monitorable* _tmp14_ = NULL;
@@ -6834,7 +6835,7 @@ 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 6837 "LibraryMonitor.c"
+#line 6838 "LibraryMonitor.c"
 	} else {
 		LibraryMonitorRuntimeFindMoveJob* _tmp24_ = NULL;
 		GFile* _tmp25_ = NULL;
@@ -6844,11 +6845,11 @@ static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self
 		_tmp25_ = _tmp24_->file;
 #line 890 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_runtime_unknown_file_discovered (self, _tmp25_);
-#line 6847 "LibraryMonitor.c"
+#line 6848 "LibraryMonitor.c"
 	}
 #line 876 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_background_job_unref0 (job);
-#line 6851 "LibraryMonitor.c"
+#line 6852 "LibraryMonitor.c"
 }
 
 
@@ -6878,7 +6879,7 @@ 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 6881 "LibraryMonitor.c"
+#line 6882 "LibraryMonitor.c"
 	} else {
 		GFile* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
@@ -6888,11 +6889,11 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil
 		_tmp4_ = library_monitor_is_blacklisted (_tmp3_);
 #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = _tmp4_;
-#line 6891 "LibraryMonitor.c"
+#line 6892 "LibraryMonitor.c"
 	}
 #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp0_) {
-#line 6895 "LibraryMonitor.c"
+#line 6896 "LibraryMonitor.c"
 		GFile* _tmp5_ = NULL;
 		GFile* _tmp6_ = NULL;
 		GFileInfo* _tmp7_ = NULL;
@@ -6906,11 +6907,11 @@ 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 6909 "LibraryMonitor.c"
+#line 6910 "LibraryMonitor.c"
 	}
 #line 901 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	known = FALSE;
-#line 6913 "LibraryMonitor.c"
+#line 6914 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
 		GeeList* _tmp8_ = NULL;
@@ -6938,7 +6939,7 @@ 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 6941 "LibraryMonitor.c"
+#line 6942 "LibraryMonitor.c"
 			gint _tmp13_ = 0;
 			gint _tmp14_ = 0;
 			gint _tmp15_ = 0;
@@ -6963,7 +6964,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 6966 "LibraryMonitor.c"
+#line 6967 "LibraryMonitor.c"
 			}
 #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp16_ = _monitor_list;
@@ -6991,27 +6992,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 6994 "LibraryMonitor.c"
+#line 6995 "LibraryMonitor.c"
 			}
 #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 6998 "LibraryMonitor.c"
+#line 6999 "LibraryMonitor.c"
 		}
 #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 7002 "LibraryMonitor.c"
+#line 7003 "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 7008 "LibraryMonitor.c"
+#line 7009 "LibraryMonitor.c"
 		GFile* _tmp25_ = NULL;
 #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 7014 "LibraryMonitor.c"
+#line 7015 "LibraryMonitor.c"
 	}
 #line 913 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp26_ = old_file;
@@ -7021,7 +7022,7 @@ 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 7024 "LibraryMonitor.c"
+#line 7025 "LibraryMonitor.c"
 }
 
 
@@ -7042,7 +7043,7 @@ 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 7045 "LibraryMonitor.c"
+#line 7046 "LibraryMonitor.c"
 		GFile* _tmp2_ = NULL;
 #line 918 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp2_ = file;
@@ -7050,11 +7051,11 @@ static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GF
 		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 7053 "LibraryMonitor.c"
+#line 7054 "LibraryMonitor.c"
 	}
 #line 923 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	known = FALSE;
-#line 7057 "LibraryMonitor.c"
+#line 7058 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
 		GeeList* _tmp3_ = NULL;
@@ -7082,7 +7083,7 @@ 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 7085 "LibraryMonitor.c"
+#line 7086 "LibraryMonitor.c"
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
 			gint _tmp10_ = 0;
@@ -7105,7 +7106,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 7108 "LibraryMonitor.c"
+#line 7109 "LibraryMonitor.c"
 			}
 #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp11_ = _monitor_list;
@@ -7129,33 +7130,33 @@ 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 7132 "LibraryMonitor.c"
+#line 7133 "LibraryMonitor.c"
 			}
 #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 7136 "LibraryMonitor.c"
+#line 7137 "LibraryMonitor.c"
 		}
 #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 7140 "LibraryMonitor.c"
+#line 7141 "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 7146 "LibraryMonitor.c"
+#line 7147 "LibraryMonitor.c"
 		GFile* _tmp18_ = NULL;
 #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 7152 "LibraryMonitor.c"
+#line 7153 "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 7158 "LibraryMonitor.c"
+#line 7159 "LibraryMonitor.c"
 }
 
 
@@ -7176,7 +7177,7 @@ 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 7179 "LibraryMonitor.c"
+#line 7180 "LibraryMonitor.c"
 		GFile* _tmp2_ = NULL;
 #line 940 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp2_ = file;
@@ -7184,11 +7185,11 @@ static void library_monitor_real_notify_file_attributes_altered (DirectoryMonito
 		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 7187 "LibraryMonitor.c"
+#line 7188 "LibraryMonitor.c"
 	}
 #line 945 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	known = FALSE;
-#line 7191 "LibraryMonitor.c"
+#line 7192 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
 		GeeList* _tmp3_ = NULL;
@@ -7216,7 +7217,7 @@ 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 7219 "LibraryMonitor.c"
+#line 7220 "LibraryMonitor.c"
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
 			gint _tmp10_ = 0;
@@ -7239,7 +7240,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 7242 "LibraryMonitor.c"
+#line 7243 "LibraryMonitor.c"
 			}
 #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp11_ = _monitor_list;
@@ -7263,33 +7264,33 @@ 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 7266 "LibraryMonitor.c"
+#line 7267 "LibraryMonitor.c"
 			}
 #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 7270 "LibraryMonitor.c"
+#line 7271 "LibraryMonitor.c"
 		}
 #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 7274 "LibraryMonitor.c"
+#line 7275 "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 7280 "LibraryMonitor.c"
+#line 7281 "LibraryMonitor.c"
 		GFile* _tmp18_ = NULL;
 #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 7286 "LibraryMonitor.c"
+#line 7287 "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 7292 "LibraryMonitor.c"
+#line 7293 "LibraryMonitor.c"
 }
 
 
@@ -7313,7 +7314,7 @@ 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 7316 "LibraryMonitor.c"
+#line 7317 "LibraryMonitor.c"
 		GFile* _tmp2_ = NULL;
 		GFileInfo* _tmp3_ = NULL;
 #line 962 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7324,11 +7325,11 @@ 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 7327 "LibraryMonitor.c"
+#line 7328 "LibraryMonitor.c"
 	}
 #line 967 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	known = FALSE;
-#line 7331 "LibraryMonitor.c"
+#line 7332 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
 		GeeList* _tmp4_ = NULL;
@@ -7356,7 +7357,7 @@ 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 7359 "LibraryMonitor.c"
+#line 7360 "LibraryMonitor.c"
 			gint _tmp9_ = 0;
 			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
@@ -7380,7 +7381,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 7383 "LibraryMonitor.c"
+#line 7384 "LibraryMonitor.c"
 			}
 #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp12_ = _monitor_list;
@@ -7406,27 +7407,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 7409 "LibraryMonitor.c"
+#line 7410 "LibraryMonitor.c"
 			}
 #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 7413 "LibraryMonitor.c"
+#line 7414 "LibraryMonitor.c"
 		}
 #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 7417 "LibraryMonitor.c"
+#line 7418 "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 7423 "LibraryMonitor.c"
+#line 7424 "LibraryMonitor.c"
 		GFile* _tmp20_ = NULL;
 #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 7429 "LibraryMonitor.c"
+#line 7430 "LibraryMonitor.c"
 	}
 #line 979 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp21_ = file;
@@ -7434,7 +7435,7 @@ 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 7437 "LibraryMonitor.c"
+#line 7438 "LibraryMonitor.c"
 }
 
 
@@ -7455,7 +7456,7 @@ 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 7458 "LibraryMonitor.c"
+#line 7459 "LibraryMonitor.c"
 		GFile* _tmp2_ = NULL;
 #line 984 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp2_ = file;
@@ -7463,11 +7464,11 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF
 		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 7466 "LibraryMonitor.c"
+#line 7467 "LibraryMonitor.c"
 	}
 #line 989 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	known = FALSE;
-#line 7470 "LibraryMonitor.c"
+#line 7471 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
 		GeeList* _tmp3_ = NULL;
@@ -7495,7 +7496,7 @@ 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 7498 "LibraryMonitor.c"
+#line 7499 "LibraryMonitor.c"
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
 			gint _tmp10_ = 0;
@@ -7518,7 +7519,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 7521 "LibraryMonitor.c"
+#line 7522 "LibraryMonitor.c"
 			}
 #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp11_ = _monitor_list;
@@ -7542,21 +7543,21 @@ 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 7545 "LibraryMonitor.c"
+#line 7546 "LibraryMonitor.c"
 			}
 #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 7549 "LibraryMonitor.c"
+#line 7550 "LibraryMonitor.c"
 		}
 #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 7553 "LibraryMonitor.c"
+#line 7554 "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 7559 "LibraryMonitor.c"
+#line 7560 "LibraryMonitor.c"
 		Tombstone* tombstone = NULL;
 		TombstoneSourceCollection* _tmp18_ = NULL;
 		GFile* _tmp19_ = NULL;
@@ -7575,7 +7576,7 @@ 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 7578 "LibraryMonitor.c"
+#line 7579 "LibraryMonitor.c"
 			GFile* _tmp22_ = NULL;
 			gchar* _tmp23_ = NULL;
 			gchar* _tmp24_ = NULL;
@@ -7597,7 +7598,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 7600 "LibraryMonitor.c"
+#line 7601 "LibraryMonitor.c"
 		}
 #line 1007 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp27_ = file;
@@ -7605,13 +7606,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 7608 "LibraryMonitor.c"
+#line 7609 "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 7614 "LibraryMonitor.c"
+#line 7615 "LibraryMonitor.c"
 }
 
 
@@ -7630,19 +7631,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 7633 "LibraryMonitor.c"
+#line 7634 "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 7639 "LibraryMonitor.c"
+#line 7640 "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 7645 "LibraryMonitor.c"
+#line 7646 "LibraryMonitor.c"
 }
 
 
@@ -7661,33 +7662,33 @@ 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 7664 "LibraryMonitor.c"
+#line 7665 "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 7670 "LibraryMonitor.c"
+#line 7671 "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 7676 "LibraryMonitor.c"
+#line 7677 "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 7683 "LibraryMonitor.c"
+#line 7684 "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 7690 "LibraryMonitor.c"
+#line 7691 "LibraryMonitor.c"
 }
 
 
@@ -7740,21 +7741,21 @@ 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 7743 "LibraryMonitor.c"
+#line 7744 "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 7750 "LibraryMonitor.c"
+#line 7751 "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 7757 "LibraryMonitor.c"
+#line 7758 "LibraryMonitor.c"
 }
 
 
@@ -7778,7 +7779,7 @@ 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 7781 "LibraryMonitor.c"
+#line 7782 "LibraryMonitor.c"
 		GeeIterator* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		GeeIterator* _tmp4_ = NULL;
@@ -7796,7 +7797,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 7799 "LibraryMonitor.c"
+#line 7800 "LibraryMonitor.c"
 		}
 #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp4_ = iter;
@@ -7818,13 +7819,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 7821 "LibraryMonitor.c"
+#line 7822 "LibraryMonitor.c"
 			GeeIterator* _tmp11_ = NULL;
 #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 7827 "LibraryMonitor.c"
+#line 7828 "LibraryMonitor.c"
 		}
 	}
 #line 128 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7839,11 +7840,11 @@ 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 7842 "LibraryMonitor.c"
+#line 7843 "LibraryMonitor.c"
 	}
 #line 131 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	md5 = NULL;
-#line 7846 "LibraryMonitor.c"
+#line 7847 "LibraryMonitor.c"
 	{
 		gchar* _tmp15_ = NULL;
 		GFile* _tmp16_ = NULL;
@@ -7857,7 +7858,7 @@ 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 7860 "LibraryMonitor.c"
+#line 7861 "LibraryMonitor.c"
 			goto __catch491_g_error;
 		}
 #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7870,7 +7871,7 @@ 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 7873 "LibraryMonitor.c"
+#line 7874 "LibraryMonitor.c"
 	}
 	goto __finally491;
 	__catch491_g_error:
@@ -7898,7 +7899,7 @@ 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 7901 "LibraryMonitor.c"
+#line 7902 "LibraryMonitor.c"
 	}
 	__finally491:
 #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7913,7 +7914,7 @@ 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 7916 "LibraryMonitor.c"
+#line 7917 "LibraryMonitor.c"
 	}
 	{
 		GeeIterator* _candidate_it = NULL;
@@ -7927,7 +7928,7 @@ 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 7930 "LibraryMonitor.c"
+#line 7931 "LibraryMonitor.c"
 			GeeIterator* _tmp23_ = NULL;
 			gboolean _tmp24_ = FALSE;
 			Monitorable* candidate = NULL;
@@ -7949,7 +7950,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 7952 "LibraryMonitor.c"
+#line 7953 "LibraryMonitor.c"
 			}
 #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp25_ = _candidate_it;
@@ -7975,13 +7976,13 @@ 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 7978 "LibraryMonitor.c"
+#line 7979 "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 7984 "LibraryMonitor.c"
+#line 7985 "LibraryMonitor.c"
 				GFile* _tmp33_ = NULL;
 				gchar* _tmp34_ = NULL;
 				gchar* _tmp35_ = NULL;
@@ -8025,15 +8026,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 8027 "LibraryMonitor.c"
+#line 8028 "LibraryMonitor.c"
 					GeeArrayList* _tmp43_ = NULL;
 #line 149 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-					_tmp43_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_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 8035 "LibraryMonitor.c"
+#line 8036 "LibraryMonitor.c"
 				}
 #line 151 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp44_ = self->losers;
@@ -8045,7 +8046,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 8047 "LibraryMonitor.c"
+#line 8048 "LibraryMonitor.c"
 			}
 #line 156 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp46_ = candidate;
@@ -8057,17 +8058,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 8059 "LibraryMonitor.c"
+#line 8060 "LibraryMonitor.c"
 		}
 #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_candidate_it);
-#line 8063 "LibraryMonitor.c"
+#line 8064 "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 8069 "LibraryMonitor.c"
+#line 8070 "LibraryMonitor.c"
 }
 
 
@@ -8077,8 +8078,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 = library_monitor_find_move_job_real_execute;
-#line 8080 "LibraryMonitor.c"
+	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) library_monitor_find_move_job_real_execute;
+#line 8081 "LibraryMonitor.c"
 }
 
 
@@ -8089,7 +8090,7 @@ 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 8091 "LibraryMonitor.c"
+#line 8092 "LibraryMonitor.c"
 }
 
 
@@ -8109,7 +8110,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 8111 "LibraryMonitor.c"
+#line 8112 "LibraryMonitor.c"
 }
 
 
@@ -8128,7 +8129,7 @@ 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 8130 "LibraryMonitor.c"
+#line 8131 "LibraryMonitor.c"
 }
 
 
@@ -8178,14 +8179,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 8180 "LibraryMonitor.c"
+#line 8181 "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 8187 "LibraryMonitor.c"
+#line 8188 "LibraryMonitor.c"
 }
 
 
@@ -8197,7 +8198,7 @@ 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 8199 "LibraryMonitor.c"
+#line 8200 "LibraryMonitor.c"
 	{
 		gchar* _tmp0_ = NULL;
 		GFile* _tmp1_ = NULL;
@@ -8211,7 +8212,7 @@ 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 8213 "LibraryMonitor.c"
+#line 8214 "LibraryMonitor.c"
 			goto __catch492_g_error;
 		}
 #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8224,7 +8225,7 @@ 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 8226 "LibraryMonitor.c"
+#line 8227 "LibraryMonitor.c"
 	}
 	goto __finally492;
 	__catch492_g_error:
@@ -8250,7 +8251,7 @@ 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 8252 "LibraryMonitor.c"
+#line 8253 "LibraryMonitor.c"
 	}
 	__finally492:
 #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8263,7 +8264,7 @@ 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 8265 "LibraryMonitor.c"
+#line 8266 "LibraryMonitor.c"
 	}
 	{
 		GeeIterator* _candidate_it = NULL;
@@ -8277,7 +8278,7 @@ 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 8279 "LibraryMonitor.c"
+#line 8280 "LibraryMonitor.c"
 			GeeIterator* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
 			Monitorable* candidate = NULL;
@@ -8296,7 +8297,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 8298 "LibraryMonitor.c"
+#line 8299 "LibraryMonitor.c"
 			}
 #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp10_ = _candidate_it;
@@ -8318,7 +8319,7 @@ 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 8320 "LibraryMonitor.c"
+#line 8321 "LibraryMonitor.c"
 				Monitorable* _tmp17_ = NULL;
 				Monitorable* _tmp18_ = NULL;
 #line 188 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8333,19 +8334,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 8335 "LibraryMonitor.c"
+#line 8336 "LibraryMonitor.c"
 			}
 #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (candidate);
-#line 8339 "LibraryMonitor.c"
+#line 8340 "LibraryMonitor.c"
 		}
 #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_candidate_it);
-#line 8343 "LibraryMonitor.c"
+#line 8344 "LibraryMonitor.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_free0 (md5);
-#line 8347 "LibraryMonitor.c"
+#line 8348 "LibraryMonitor.c"
 }
 
 
@@ -8355,8 +8356,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 = library_monitor_runtime_find_move_job_real_execute;
-#line 8358 "LibraryMonitor.c"
+	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) library_monitor_runtime_find_move_job_real_execute;
+#line 8359 "LibraryMonitor.c"
 }
 
 
@@ -8365,7 +8366,7 @@ 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 8367 "LibraryMonitor.c"
+#line 8368 "LibraryMonitor.c"
 }
 
 
@@ -8383,7 +8384,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 8385 "LibraryMonitor.c"
+#line 8386 "LibraryMonitor.c"
 }
 
 
@@ -8429,21 +8430,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 8431 "LibraryMonitor.c"
+#line 8432 "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 8438 "LibraryMonitor.c"
+#line 8439 "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 8445 "LibraryMonitor.c"
+#line 8446 "LibraryMonitor.c"
 }
 
 
@@ -8452,7 +8453,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 8454 "LibraryMonitor.c"
+#line 8455 "LibraryMonitor.c"
 	}
 }
 
@@ -8462,11 +8463,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 8464 "LibraryMonitor.c"
+#line 8465 "LibraryMonitor.c"
 	} else {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8468 "LibraryMonitor.c"
+#line 8469 "LibraryMonitor.c"
 	}
 }
 
@@ -8474,37 +8475,37 @@ 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 8476 "LibraryMonitor.c"
+#line 8477 "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 8483 "LibraryMonitor.c"
+#line 8484 "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 8490 "LibraryMonitor.c"
+#line 8491 "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 8494 "LibraryMonitor.c"
+#line 8495 "LibraryMonitor.c"
 		}
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = library_monitor_verify_job_ref (object);
-#line 8498 "LibraryMonitor.c"
+#line 8499 "LibraryMonitor.c"
 	} else {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 8502 "LibraryMonitor.c"
+#line 8503 "LibraryMonitor.c"
 	}
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return NULL;
-#line 8506 "LibraryMonitor.c"
+#line 8507 "LibraryMonitor.c"
 }
 
 
@@ -8515,25 +8516,25 @@ static gchar* library_monitor_value_verify_job_lcopy_value (const GValue* value,
 	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 8517 "LibraryMonitor.c"
+#line 8518 "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 8523 "LibraryMonitor.c"
+#line 8524 "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 8527 "LibraryMonitor.c"
+#line 8528 "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 8531 "LibraryMonitor.c"
+#line 8532 "LibraryMonitor.c"
 	}
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return NULL;
-#line 8535 "LibraryMonitor.c"
+#line 8536 "LibraryMonitor.c"
 }
 
 
@@ -8547,7 +8548,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 8549 "LibraryMonitor.c"
+#line 8550 "LibraryMonitor.c"
 }
 
 
@@ -8556,7 +8557,7 @@ 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 8558 "LibraryMonitor.c"
+#line 8559 "LibraryMonitor.c"
 }
 
 
@@ -8576,17 +8577,17 @@ 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 8578 "LibraryMonitor.c"
+#line 8579 "LibraryMonitor.c"
 	} else {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 8582 "LibraryMonitor.c"
+#line 8583 "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 8588 "LibraryMonitor.c"
+#line 8589 "LibraryMonitor.c"
 	}
 }
 
@@ -8605,17 +8606,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 8607 "LibraryMonitor.c"
+#line 8608 "LibraryMonitor.c"
 	} else {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 8611 "LibraryMonitor.c"
+#line 8612 "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 8617 "LibraryMonitor.c"
+#line 8618 "LibraryMonitor.c"
 	}
 }
 
@@ -8625,14 +8626,14 @@ 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 8627 "LibraryMonitor.c"
+#line 8628 "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 8634 "LibraryMonitor.c"
+#line 8635 "LibraryMonitor.c"
 }
 
 
@@ -8646,7 +8647,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 8648 "LibraryMonitor.c"
+#line 8649 "LibraryMonitor.c"
 }
 
 
@@ -8671,7 +8672,7 @@ static gpointer library_monitor_verify_job_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return instance;
-#line 8673 "LibraryMonitor.c"
+#line 8674 "LibraryMonitor.c"
 }
 
 
@@ -8684,7 +8685,7 @@ 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 8686 "LibraryMonitor.c"
+#line 8687 "LibraryMonitor.c"
 	}
 }
 
@@ -8697,25 +8698,25 @@ static void library_monitor_class_init (LibraryMonitorClass * 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -8727,14 +8728,14 @@ static void library_monitor_class_init (LibraryMonitorClass * klass) {
 #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"
-	_tmp0_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+	_tmp0_ = 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 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_blacklist = _tmp0_;
 #line 207 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_tmp1_ = hash_timed_queue_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, 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);
+	_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 8736 "LibraryMonitor.c"
+#line 8737 "LibraryMonitor.c"
 }
 
 
@@ -8764,21 +8765,21 @@ static void library_monitor_instance_init (LibraryMonitor * self) {
 #line 213 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->priv->unknown_files = NULL;
 #line 214 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_tmp3_ = gee_array_list_new (TYPE_MEDIA_MONITOR, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp3_ = gee_array_list_new (TYPE_MEDIA_MONITOR, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 214 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->priv->monitors = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_LIST, GeeList);
 #line 215 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->priv->discovered = NULL;
 #line 216 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_tmp4_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+	_tmp4_ = 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 216 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->priv->import_queue = _tmp4_;
 #line 217 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_tmp5_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+	_tmp5_ = 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 217 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->priv->pending_imports = _tmp5_;
 #line 218 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_tmp6_ = gee_array_list_new (TYPE_BATCH_IMPORT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp6_ = gee_array_list_new (TYPE_BATCH_IMPORT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 218 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->priv->batch_import_queue = _tmp6_;
 #line 219 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8794,7 +8795,7 @@ static void library_monitor_instance_init (LibraryMonitor * self) {
 #line 224 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->priv->import_queue_timer_id = (guint) 0;
 #line 225 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-	_tmp7_ = gee_linked_list_new (LIBRARY_MONITOR_TYPE_VERIFY_JOB, (GBoxedCopyFunc) library_monitor_verify_job_ref, library_monitor_verify_job_unref, NULL, NULL, NULL);
+	_tmp7_ = gee_linked_list_new (LIBRARY_MONITOR_TYPE_VERIFY_JOB, (GBoxedCopyFunc) library_monitor_verify_job_ref, (GDestroyNotify) library_monitor_verify_job_unref, NULL, NULL, NULL);
 #line 225 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->priv->verify_queue = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_QUEUE, GeeQueue);
 #line 226 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8803,7 +8804,7 @@ 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 8805 "LibraryMonitor.c"
+#line 8806 "LibraryMonitor.c"
 }
 
 
@@ -8848,7 +8849,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 8850 "LibraryMonitor.c"
+#line 8851 "LibraryMonitor.c"
 }
 
 
diff --git a/src/MediaDataRepresentation.c b/src/MediaDataRepresentation.c
index f122b3e..e0df289 100644
--- a/src/MediaDataRepresentation.c
+++ b/src/MediaDataRepresentation.c
@@ -1,4 +1,4 @@
-/* MediaDataRepresentation.c generated by valac 0.34.4, the Vala compiler
+/* MediaDataRepresentation.c generated by valac 0.34.7, the Vala compiler
  * generated from MediaDataRepresentation.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2024,11 +2024,12 @@ static const gchar* media_source_real_get_indexable_keywords (Indexable* base) {
 
 
 static gboolean media_source_real_set_event_id (MediaSource* self, EventID* id) {
+	gboolean _tmp0_ = FALSE;
 #line 95 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	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 FALSE;
-#line 2032 "MediaDataRepresentation.c"
+	return _tmp0_;
+#line 2033 "MediaDataRepresentation.c"
 }
 
 
@@ -2037,14 +2038,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 2041 "MediaDataRepresentation.c"
+#line 2042 "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 2048 "MediaDataRepresentation.c"
+#line 2049 "MediaDataRepresentation.c"
 }
 
 
@@ -2053,11 +2054,11 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 	gboolean ret = FALSE;
 	GFile* file = NULL;
 	GFile* _tmp0_ = NULL;
-	GFile* _tmp9_ = NULL;
 	GFile* _tmp10_ = NULL;
 	GFile* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	GFile* _tmp12_ = NULL;
 	gboolean _tmp13_ = FALSE;
+	gboolean _tmp14_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 97 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE);
@@ -2067,7 +2068,7 @@ 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 2071 "MediaDataRepresentation.c"
+#line 2072 "MediaDataRepresentation.c"
 	{
 		gboolean _tmp1_ = FALSE;
 		GFile* _tmp2_ = NULL;
@@ -2080,12 +2081,12 @@ 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 2084 "MediaDataRepresentation.c"
+#line 2085 "MediaDataRepresentation.c"
 			goto __catch561_g_error;
 		}
 #line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		ret = _tmp1_;
-#line 2089 "MediaDataRepresentation.c"
+#line 2090 "MediaDataRepresentation.c"
 	}
 	goto __finally561;
 	__catch561_g_error:
@@ -2117,11 +2118,13 @@ 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 2120 "MediaDataRepresentation.c"
+#line 2121 "MediaDataRepresentation.c"
 	}
 	__finally561:
 #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 2126 "MediaDataRepresentation.c"
+		gboolean _tmp9_ = FALSE;
 #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (file);
 #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2129,161 +2132,163 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		g_clear_error (&_inner_error_);
 #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-		return FALSE;
-#line 2133 "MediaDataRepresentation.c"
+		return _tmp9_;
+#line 2136 "MediaDataRepresentation.c"
 	}
 #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp9_ = file;
+	_tmp10_ = file;
 #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp10_ = app_dirs_get_import_dir ();
+	_tmp11_ = app_dirs_get_import_dir ();
 #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp11_ = _tmp10_;
+	_tmp12_ = _tmp11_;
 #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp12_ = g_file_has_prefix (_tmp9_, _tmp11_);
+	_tmp13_ = g_file_has_prefix (_tmp10_, _tmp12_);
 #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp13_ = _tmp12_;
+	_tmp14_ = _tmp13_;
 #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_g_object_unref0 (_tmp11_);
+	_g_object_unref0 (_tmp12_);
 #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	if (_tmp13_) {
-#line 2149 "MediaDataRepresentation.c"
+	if (_tmp14_) {
+#line 2152 "MediaDataRepresentation.c"
 		GFile* parent = NULL;
-		GFile* _tmp14_ = NULL;
 		GFile* _tmp15_ = NULL;
+		GFile* _tmp16_ = NULL;
 #line 112 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-		_tmp14_ = file;
+		_tmp15_ = file;
 #line 112 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-		_tmp15_ = _g_object_ref0 (_tmp14_);
+		_tmp16_ = _g_object_ref0 (_tmp15_);
 #line 112 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-		parent = _tmp15_;
+		parent = _tmp16_;
 #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 2161 "MediaDataRepresentation.c"
-			GFile* _tmp16_ = NULL;
+#line 2164 "MediaDataRepresentation.c"
 			GFile* _tmp17_ = NULL;
 			GFile* _tmp18_ = NULL;
-			gboolean _tmp19_ = FALSE;
+			GFile* _tmp19_ = NULL;
 			gboolean _tmp20_ = FALSE;
-			GFile* _tmp21_ = NULL;
+			gboolean _tmp21_ = FALSE;
 			GFile* _tmp22_ = NULL;
-			gboolean _tmp23_ = FALSE;
-			GFile* _tmp24_ = NULL;
+			GFile* _tmp23_ = NULL;
+			gboolean _tmp24_ = FALSE;
+			GFile* _tmp25_ = NULL;
 #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			_tmp16_ = parent;
+			_tmp17_ = parent;
 #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			_tmp17_ = app_dirs_get_import_dir ();
+			_tmp18_ = app_dirs_get_import_dir ();
 #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			_tmp18_ = _tmp17_;
+			_tmp19_ = _tmp18_;
 #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			_tmp19_ = g_file_equal (_tmp16_, _tmp18_);
+			_tmp20_ = g_file_equal (_tmp17_, _tmp19_);
 #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			_tmp20_ = !(!_tmp19_);
+			_tmp21_ = !(!_tmp20_);
 #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			_g_object_unref0 (_tmp18_);
+			_g_object_unref0 (_tmp19_);
 #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			if (_tmp20_) {
+			if (_tmp21_) {
 #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 2187 "MediaDataRepresentation.c"
+#line 2190 "MediaDataRepresentation.c"
 			}
 #line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			_tmp21_ = parent;
+			_tmp22_ = parent;
 #line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			_tmp22_ = g_file_get_parent (_tmp21_);
+			_tmp23_ = g_file_get_parent (_tmp22_);
 #line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (parent);
 #line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			parent = _tmp22_;
+			parent = _tmp23_;
 #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			_tmp24_ = parent;
+			_tmp25_ = parent;
 #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			if (_tmp24_ == NULL) {
+			if (_tmp25_ == NULL) {
 #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp23_ = TRUE;
-#line 2203 "MediaDataRepresentation.c"
+				_tmp24_ = TRUE;
+#line 2206 "MediaDataRepresentation.c"
 			} else {
-				GFile* _tmp25_ = NULL;
 				GFile* _tmp26_ = NULL;
 				GFile* _tmp27_ = NULL;
-				gboolean _tmp28_ = FALSE;
+				GFile* _tmp28_ = NULL;
+				gboolean _tmp29_ = FALSE;
 #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp25_ = parent;
+				_tmp26_ = parent;
 #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp26_ = app_dirs_get_import_dir ();
+				_tmp27_ = app_dirs_get_import_dir ();
 #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp27_ = _tmp26_;
+				_tmp28_ = _tmp27_;
 #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp28_ = g_file_equal (_tmp25_, _tmp27_);
+				_tmp29_ = g_file_equal (_tmp26_, _tmp28_);
 #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp23_ = _tmp28_;
+				_tmp24_ = _tmp29_;
 #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_g_object_unref0 (_tmp27_);
-#line 2221 "MediaDataRepresentation.c"
+				_g_object_unref0 (_tmp28_);
+#line 2224 "MediaDataRepresentation.c"
 			}
 #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			if (_tmp23_) {
+			if (_tmp24_) {
 #line 116 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 2227 "MediaDataRepresentation.c"
+#line 2230 "MediaDataRepresentation.c"
 			}
 			{
-				gboolean _tmp29_ = FALSE;
-				GFile* _tmp30_ = NULL;
-				gboolean _tmp31_ = FALSE;
+				gboolean _tmp30_ = FALSE;
+				GFile* _tmp31_ = NULL;
+				gboolean _tmp32_ = FALSE;
 #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp30_ = parent;
+				_tmp31_ = parent;
 #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp31_ = query_is_directory_empty (_tmp30_, &_inner_error_);
+				_tmp32_ = query_is_directory_empty (_tmp31_, &_inner_error_);
 #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp29_ = _tmp31_;
+				_tmp30_ = _tmp32_;
 #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2241 "MediaDataRepresentation.c"
+#line 2244 "MediaDataRepresentation.c"
 					goto __catch562_g_error;
 				}
 #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				if (!_tmp29_) {
+				if (!_tmp30_) {
 #line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					break;
-#line 2248 "MediaDataRepresentation.c"
+#line 2251 "MediaDataRepresentation.c"
 				}
 			}
 			goto __finally562;
 			__catch562_g_error:
 			{
 				GError* err = NULL;
-				GFile* _tmp32_ = NULL;
-				gchar* _tmp33_ = NULL;
+				GFile* _tmp33_ = NULL;
 				gchar* _tmp34_ = NULL;
-				GError* _tmp35_ = NULL;
-				const gchar* _tmp36_ = NULL;
+				gchar* _tmp35_ = NULL;
+				GError* _tmp36_ = NULL;
+				const gchar* _tmp37_ = NULL;
 #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				err = _inner_error_;
 #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_inner_error_ = NULL;
 #line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp32_ = parent;
+				_tmp33_ = parent;
 #line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp33_ = g_file_get_path (_tmp32_);
+				_tmp34_ = g_file_get_path (_tmp33_);
 #line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp34_ = _tmp33_;
+				_tmp35_ = _tmp34_;
 #line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp35_ = err;
+				_tmp36_ = err;
 #line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp36_ = _tmp35_->message;
+				_tmp37_ = _tmp36_->message;
 #line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				g_warning ("MediaDataRepresentation.vala:122: Unable to query file info for %s: %s", _tmp34_, _tmp36_);
+				g_warning ("MediaDataRepresentation.vala:122: Unable to query file info for %s: %s", _tmp35_, _tmp37_);
 #line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_g_free0 (_tmp34_);
+				_g_free0 (_tmp35_);
 #line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_error_free0 (err);
 #line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 2282 "MediaDataRepresentation.c"
+#line 2285 "MediaDataRepresentation.c"
 			}
 			__finally562:
 #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 2290 "MediaDataRepresentation.c"
+				gboolean _tmp38_ = FALSE;
 #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (parent);
 #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2293,70 +2298,72 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				g_clear_error (&_inner_error_);
 #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				return FALSE;
-#line 2297 "MediaDataRepresentation.c"
+				return _tmp38_;
+#line 2302 "MediaDataRepresentation.c"
 			}
 			{
-				GFile* _tmp37_ = NULL;
-				GFile* _tmp38_ = NULL;
-				gchar* _tmp39_ = NULL;
-				gchar* _tmp40_ = NULL;
+				GFile* _tmp39_ = NULL;
+				GFile* _tmp40_ = NULL;
+				gchar* _tmp41_ = NULL;
+				gchar* _tmp42_ = NULL;
 #line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp37_ = parent;
+				_tmp39_ = parent;
 #line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				g_file_delete (_tmp37_, NULL, &_inner_error_);
+				g_file_delete (_tmp39_, NULL, &_inner_error_);
 #line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2310 "MediaDataRepresentation.c"
+#line 2315 "MediaDataRepresentation.c"
 					goto __catch563_g_error;
 				}
 #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp38_ = parent;
+				_tmp40_ = parent;
 #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp39_ = g_file_get_path (_tmp38_);
+				_tmp41_ = g_file_get_path (_tmp40_);
 #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp40_ = _tmp39_;
+				_tmp42_ = _tmp41_;
 #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				g_debug ("MediaDataRepresentation.vala:129: Deleted empty directory %s", _tmp40_);
+				g_debug ("MediaDataRepresentation.vala:129: Deleted empty directory %s", _tmp42_);
 #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_g_free0 (_tmp40_);
-#line 2323 "MediaDataRepresentation.c"
+				_g_free0 (_tmp42_);
+#line 2328 "MediaDataRepresentation.c"
 			}
 			goto __finally563;
 			__catch563_g_error:
 			{
 				GError* err = NULL;
-				GFile* _tmp41_ = NULL;
-				gchar* _tmp42_ = NULL;
-				gchar* _tmp43_ = NULL;
-				GError* _tmp44_ = NULL;
-				const gchar* _tmp45_ = NULL;
+				GFile* _tmp43_ = NULL;
+				gchar* _tmp44_ = NULL;
+				gchar* _tmp45_ = NULL;
+				GError* _tmp46_ = NULL;
+				const gchar* _tmp47_ = NULL;
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				err = _inner_error_;
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_inner_error_ = NULL;
 #line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp41_ = parent;
+				_tmp43_ = parent;
 #line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp42_ = g_file_get_path (_tmp41_);
+				_tmp44_ = g_file_get_path (_tmp43_);
 #line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp43_ = _tmp42_;
+				_tmp45_ = _tmp44_;
 #line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp44_ = err;
+				_tmp46_ = err;
 #line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_tmp45_ = _tmp44_->message;
+				_tmp47_ = _tmp46_->message;
 #line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				g_message ("MediaDataRepresentation.vala:132: Unable to delete empty directory %s:" \
-" %s", _tmp43_, _tmp45_);
+" %s", _tmp45_, _tmp47_);
 #line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_g_free0 (_tmp43_);
+				_g_free0 (_tmp45_);
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_error_free0 (err);
-#line 2354 "MediaDataRepresentation.c"
+#line 2359 "MediaDataRepresentation.c"
 			}
 			__finally563:
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 2364 "MediaDataRepresentation.c"
+				gboolean _tmp48_ = FALSE;
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (parent);
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2366,13 +2373,13 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				g_clear_error (&_inner_error_);
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				return FALSE;
-#line 2369 "MediaDataRepresentation.c"
+				return _tmp48_;
+#line 2376 "MediaDataRepresentation.c"
 			}
 		}
 #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (parent);
-#line 2374 "MediaDataRepresentation.c"
+#line 2381 "MediaDataRepresentation.c"
 	}
 #line 138 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = ret;
@@ -2380,7 +2387,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 2382 "MediaDataRepresentation.c"
+#line 2389 "MediaDataRepresentation.c"
 }
 
 
@@ -2404,7 +2411,7 @@ 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 2406 "MediaDataRepresentation.c"
+#line 2413 "MediaDataRepresentation.c"
 		gchar* _tmp4_ = NULL;
 #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp4_ = media_source_get_basename (self);
@@ -2412,7 +2419,7 @@ static gchar* media_source_real_get_name (DataObject* base) {
 		_g_free0 (_tmp1_);
 #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = _tmp4_;
-#line 2414 "MediaDataRepresentation.c"
+#line 2421 "MediaDataRepresentation.c"
 	} else {
 		const gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -2424,7 +2431,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 2426 "MediaDataRepresentation.c"
+#line 2433 "MediaDataRepresentation.c"
 	}
 #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp1_;
@@ -2432,7 +2439,7 @@ static gchar* media_source_real_get_name (DataObject* base) {
 	_g_free0 (title);
 #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 2434 "MediaDataRepresentation.c"
+#line 2441 "MediaDataRepresentation.c"
 }
 
 
@@ -2456,7 +2463,7 @@ static gchar* media_source_real_get_basename (MediaSource* self) {
 	result = _tmp3_;
 #line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 2458 "MediaDataRepresentation.c"
+#line 2465 "MediaDataRepresentation.c"
 }
 
 
@@ -2465,7 +2472,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 2467 "MediaDataRepresentation.c"
+#line 2474 "MediaDataRepresentation.c"
 }
 
 
@@ -2474,7 +2481,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 2476 "MediaDataRepresentation.c"
+#line 2483 "MediaDataRepresentation.c"
 }
 
 
@@ -2483,7 +2490,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 2485 "MediaDataRepresentation.c"
+#line 2492 "MediaDataRepresentation.c"
 }
 
 
@@ -2492,7 +2499,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 2494 "MediaDataRepresentation.c"
+#line 2501 "MediaDataRepresentation.c"
 }
 
 
@@ -2501,16 +2508,17 @@ 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 2503 "MediaDataRepresentation.c"
+#line 2510 "MediaDataRepresentation.c"
 }
 
 
 static guint64 media_source_real_get_master_filesize (MediaSource* self) {
+	guint64 _tmp0_ = 0ULL;
 #line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	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 0ULL;
-#line 2512 "MediaDataRepresentation.c"
+	return _tmp0_;
+#line 2520 "MediaDataRepresentation.c"
 }
 
 
@@ -2519,16 +2527,17 @@ 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 2521 "MediaDataRepresentation.c"
+#line 2529 "MediaDataRepresentation.c"
 }
 
 
 static guint64 media_source_real_get_filesize (MediaSource* self) {
+	guint64 _tmp0_ = 0ULL;
 #line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	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 0ULL;
-#line 2530 "MediaDataRepresentation.c"
+	return _tmp0_;
+#line 2539 "MediaDataRepresentation.c"
 }
 
 
@@ -2537,16 +2546,17 @@ 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 2539 "MediaDataRepresentation.c"
+#line 2548 "MediaDataRepresentation.c"
 }
 
 
 static time_t media_source_real_get_timestamp (MediaSource* self) {
+	time_t _tmp0_ = 0;
 #line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	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 0;
-#line 2548 "MediaDataRepresentation.c"
+	return _tmp0_;
+#line 2558 "MediaDataRepresentation.c"
 }
 
 
@@ -2555,7 +2565,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 2557 "MediaDataRepresentation.c"
+#line 2567 "MediaDataRepresentation.c"
 }
 
 
@@ -2564,7 +2574,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 2566 "MediaDataRepresentation.c"
+#line 2576 "MediaDataRepresentation.c"
 }
 
 
@@ -2573,7 +2583,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 2575 "MediaDataRepresentation.c"
+#line 2585 "MediaDataRepresentation.c"
 }
 
 
@@ -2582,7 +2592,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 2584 "MediaDataRepresentation.c"
+#line 2594 "MediaDataRepresentation.c"
 }
 
 
@@ -2591,7 +2601,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 2593 "MediaDataRepresentation.c"
+#line 2603 "MediaDataRepresentation.c"
 }
 
 
@@ -2600,7 +2610,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 2602 "MediaDataRepresentation.c"
+#line 2612 "MediaDataRepresentation.c"
 }
 
 
@@ -2609,7 +2619,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 2611 "MediaDataRepresentation.c"
+#line 2621 "MediaDataRepresentation.c"
 }
 
 
@@ -2618,7 +2628,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 2620 "MediaDataRepresentation.c"
+#line 2630 "MediaDataRepresentation.c"
 }
 
 
@@ -2627,16 +2637,17 @@ 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 2629 "MediaDataRepresentation.c"
+#line 2639 "MediaDataRepresentation.c"
 }
 
 
 static gboolean media_source_real_set_comment (MediaSource* self, const gchar* comment) {
+	gboolean _tmp0_ = FALSE;
 #line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	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 FALSE;
-#line 2638 "MediaDataRepresentation.c"
+	return _tmp0_;
+#line 2649 "MediaDataRepresentation.c"
 }
 
 
@@ -2645,7 +2656,7 @@ 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 2647 "MediaDataRepresentation.c"
+#line 2658 "MediaDataRepresentation.c"
 }
 
 
@@ -2661,7 +2672,7 @@ gchar* media_source_prep_title (const gchar* title) {
 	result = _tmp1_;
 #line 166 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 2663 "MediaDataRepresentation.c"
+#line 2674 "MediaDataRepresentation.c"
 }
 
 
@@ -2677,7 +2688,7 @@ gchar* media_source_prep_comment (const gchar* comment) {
 	result = _tmp1_;
 #line 171 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 2679 "MediaDataRepresentation.c"
+#line 2690 "MediaDataRepresentation.c"
 }
 
 
@@ -2686,7 +2697,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 2688 "MediaDataRepresentation.c"
+#line 2699 "MediaDataRepresentation.c"
 }
 
 
@@ -2695,7 +2706,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 2697 "MediaDataRepresentation.c"
+#line 2708 "MediaDataRepresentation.c"
 }
 
 
@@ -2704,7 +2715,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 2706 "MediaDataRepresentation.c"
+#line 2717 "MediaDataRepresentation.c"
 }
 
 
@@ -2713,7 +2724,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 2715 "MediaDataRepresentation.c"
+#line 2726 "MediaDataRepresentation.c"
 }
 
 
@@ -2722,7 +2733,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 2724 "MediaDataRepresentation.c"
+#line 2735 "MediaDataRepresentation.c"
 }
 
 
@@ -2731,7 +2742,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 2733 "MediaDataRepresentation.c"
+#line 2744 "MediaDataRepresentation.c"
 }
 
 
@@ -2740,7 +2751,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 2742 "MediaDataRepresentation.c"
+#line 2753 "MediaDataRepresentation.c"
 }
 
 
@@ -2749,7 +2760,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 2751 "MediaDataRepresentation.c"
+#line 2762 "MediaDataRepresentation.c"
 }
 
 
@@ -2758,7 +2769,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 2760 "MediaDataRepresentation.c"
+#line 2771 "MediaDataRepresentation.c"
 }
 
 
@@ -2767,7 +2778,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 2769 "MediaDataRepresentation.c"
+#line 2780 "MediaDataRepresentation.c"
 }
 
 
@@ -2776,7 +2787,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 2778 "MediaDataRepresentation.c"
+#line 2789 "MediaDataRepresentation.c"
 }
 
 
@@ -2785,16 +2796,17 @@ 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 2787 "MediaDataRepresentation.c"
+#line 2798 "MediaDataRepresentation.c"
 }
 
 
 static gboolean media_source_real_is_trashed (MediaSource* self) {
+	gboolean _tmp0_ = FALSE;
 #line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	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 FALSE;
-#line 2796 "MediaDataRepresentation.c"
+	return _tmp0_;
+#line 2808 "MediaDataRepresentation.c"
 }
 
 
@@ -2803,7 +2815,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 2805 "MediaDataRepresentation.c"
+#line 2817 "MediaDataRepresentation.c"
 }
 
 
@@ -2812,7 +2824,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 2814 "MediaDataRepresentation.c"
+#line 2826 "MediaDataRepresentation.c"
 }
 
 
@@ -2821,7 +2833,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 2823 "MediaDataRepresentation.c"
+#line 2835 "MediaDataRepresentation.c"
 }
 
 
@@ -2830,7 +2842,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 2832 "MediaDataRepresentation.c"
+#line 2844 "MediaDataRepresentation.c"
 }
 
 
@@ -2839,16 +2851,17 @@ 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 2841 "MediaDataRepresentation.c"
+#line 2853 "MediaDataRepresentation.c"
 }
 
 
 static gboolean media_source_real_is_offline (MediaSource* self) {
+	gboolean _tmp0_ = FALSE;
 #line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	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 FALSE;
-#line 2850 "MediaDataRepresentation.c"
+	return _tmp0_;
+#line 2863 "MediaDataRepresentation.c"
 }
 
 
@@ -2857,7 +2870,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 2859 "MediaDataRepresentation.c"
+#line 2872 "MediaDataRepresentation.c"
 }
 
 
@@ -2866,7 +2879,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 2868 "MediaDataRepresentation.c"
+#line 2881 "MediaDataRepresentation.c"
 }
 
 
@@ -2875,7 +2888,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 2877 "MediaDataRepresentation.c"
+#line 2890 "MediaDataRepresentation.c"
 }
 
 
@@ -2884,7 +2897,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 2886 "MediaDataRepresentation.c"
+#line 2899 "MediaDataRepresentation.c"
 }
 
 
@@ -2893,7 +2906,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 2895 "MediaDataRepresentation.c"
+#line 2908 "MediaDataRepresentation.c"
 }
 
 
@@ -2902,7 +2915,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 2904 "MediaDataRepresentation.c"
+#line 2917 "MediaDataRepresentation.c"
 }
 
 
@@ -2911,7 +2924,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 2913 "MediaDataRepresentation.c"
+#line 2926 "MediaDataRepresentation.c"
 }
 
 
@@ -2920,7 +2933,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 2922 "MediaDataRepresentation.c"
+#line 2935 "MediaDataRepresentation.c"
 }
 
 
@@ -2929,7 +2942,7 @@ 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 2931 "MediaDataRepresentation.c"
+#line 2944 "MediaDataRepresentation.c"
 }
 
 
@@ -2950,7 +2963,7 @@ Event* media_source_get_event (MediaSource* self) {
 	_tmp0_ = self->priv->event;
 #line 205 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp0_ != NULL) {
-#line 2952 "MediaDataRepresentation.c"
+#line 2965 "MediaDataRepresentation.c"
 		Event* _tmp1_ = NULL;
 		Event* _tmp2_ = NULL;
 #line 206 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2961,7 +2974,7 @@ Event* media_source_get_event (MediaSource* self) {
 		result = _tmp2_;
 #line 206 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 2963 "MediaDataRepresentation.c"
+#line 2976 "MediaDataRepresentation.c"
 	}
 #line 208 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_get_event_id (self, &_tmp3_);
@@ -2975,7 +2988,7 @@ Event* media_source_get_event (MediaSource* self) {
 		result = NULL;
 #line 210 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 2977 "MediaDataRepresentation.c"
+#line 2990 "MediaDataRepresentation.c"
 	}
 #line 212 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp5_ = event_global;
@@ -2995,7 +3008,7 @@ Event* media_source_get_event (MediaSource* self) {
 	result = _tmp9_;
 #line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 2997 "MediaDataRepresentation.c"
+#line 3010 "MediaDataRepresentation.c"
 }
 
 
@@ -3020,7 +3033,7 @@ 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 3022 "MediaDataRepresentation.c"
+#line 3035 "MediaDataRepresentation.c"
 		Event* _tmp2_ = NULL;
 		EventID _tmp3_ = {0};
 #line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3029,11 +3042,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 3031 "MediaDataRepresentation.c"
+#line 3044 "MediaDataRepresentation.c"
 	} else {
 #line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		event_id_init (&_tmp0_, EVENT_ID_INVALID);
-#line 3035 "MediaDataRepresentation.c"
+#line 3048 "MediaDataRepresentation.c"
 	}
 #line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	event_id = _tmp0_;
@@ -3051,7 +3064,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 3053 "MediaDataRepresentation.c"
+#line 3066 "MediaDataRepresentation.c"
 	}
 #line 222 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp8_ = event_id;
@@ -3063,7 +3076,7 @@ gboolean media_source_set_event (MediaSource* self, Event* new_event) {
 	_tmp10_ = committed;
 #line 223 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp10_) {
-#line 3065 "MediaDataRepresentation.c"
+#line 3078 "MediaDataRepresentation.c"
 		Event* _tmp11_ = NULL;
 		Event* _tmp13_ = NULL;
 		Event* _tmp15_ = NULL;
@@ -3074,25 +3087,25 @@ gboolean media_source_set_event (MediaSource* self, Event* new_event) {
 		_tmp11_ = self->priv->event;
 #line 224 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		if (_tmp11_ != NULL) {
-#line 3076 "MediaDataRepresentation.c"
+#line 3089 "MediaDataRepresentation.c"
 			Event* _tmp12_ = NULL;
 #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 3082 "MediaDataRepresentation.c"
+#line 3095 "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 3088 "MediaDataRepresentation.c"
+#line 3101 "MediaDataRepresentation.c"
 			Event* _tmp14_ = NULL;
 #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 3094 "MediaDataRepresentation.c"
+#line 3107 "MediaDataRepresentation.c"
 		}
 #line 230 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp15_ = new_event;
@@ -3110,13 +3123,13 @@ 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 3112 "MediaDataRepresentation.c"
+#line 3125 "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 3118 "MediaDataRepresentation.c"
+#line 3131 "MediaDataRepresentation.c"
 }
 
 
@@ -3139,7 +3152,7 @@ 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 3141 "MediaDataRepresentation.c"
+#line 3154 "MediaDataRepresentation.c"
 		Event* _tmp2_ = NULL;
 		EventID _tmp3_ = {0};
 #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3148,11 +3161,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 3150 "MediaDataRepresentation.c"
+#line 3163 "MediaDataRepresentation.c"
 	} else {
 #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		event_id_init (&_tmp0_, EVENT_ID_INVALID);
-#line 3154 "MediaDataRepresentation.c"
+#line 3167 "MediaDataRepresentation.c"
 	}
 #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	event_id = _tmp0_;
@@ -3160,7 +3173,7 @@ 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 3162 "MediaDataRepresentation.c"
+#line 3175 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _media_it = NULL;
 		GeeCollection* _tmp5_ = NULL;
@@ -3173,7 +3186,7 @@ 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 3175 "MediaDataRepresentation.c"
+#line 3188 "MediaDataRepresentation.c"
 			GeeIterator* _tmp7_ = NULL;
 			gboolean _tmp8_ = FALSE;
 			MediaSource* media = NULL;
@@ -3196,7 +3209,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 3198 "MediaDataRepresentation.c"
+#line 3211 "MediaDataRepresentation.c"
 			}
 #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp9_ = _media_it;
@@ -3214,7 +3227,7 @@ 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 3216 "MediaDataRepresentation.c"
+#line 3229 "MediaDataRepresentation.c"
 				Event* _tmp14_ = NULL;
 				MediaSource* _tmp15_ = NULL;
 #line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3223,7 +3236,7 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event,
 				_tmp15_ = media;
 #line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				event_detach (_tmp14_, _tmp15_);
-#line 3225 "MediaDataRepresentation.c"
+#line 3238 "MediaDataRepresentation.c"
 			}
 #line 249 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp16_ = media;
@@ -3245,17 +3258,17 @@ 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 3247 "MediaDataRepresentation.c"
+#line 3260 "MediaDataRepresentation.c"
 		}
 #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_media_it);
-#line 3251 "MediaDataRepresentation.c"
+#line 3264 "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 3257 "MediaDataRepresentation.c"
+#line 3270 "MediaDataRepresentation.c"
 		Event* _tmp22_ = NULL;
 		GeeCollection* _tmp23_ = NULL;
 #line 254 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3264,13 +3277,13 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event,
 		_tmp23_ = media_sources;
 #line 254 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		event_attach_many (_tmp22_, _tmp23_);
-#line 3266 "MediaDataRepresentation.c"
+#line 3279 "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 3272 "MediaDataRepresentation.c"
+#line 3285 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _media_it = NULL;
 		GeeCollection* _tmp25_ = NULL;
@@ -3283,7 +3296,7 @@ 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 3285 "MediaDataRepresentation.c"
+#line 3298 "MediaDataRepresentation.c"
 			GeeIterator* _tmp27_ = NULL;
 			gboolean _tmp28_ = FALSE;
 			MediaSource* media = NULL;
@@ -3299,7 +3312,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 3301 "MediaDataRepresentation.c"
+#line 3314 "MediaDataRepresentation.c"
 			}
 #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp29_ = _media_it;
@@ -3315,11 +3328,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 3317 "MediaDataRepresentation.c"
+#line 3330 "MediaDataRepresentation.c"
 		}
 #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_media_it);
-#line 3321 "MediaDataRepresentation.c"
+#line 3334 "MediaDataRepresentation.c"
 	}
 #line 260 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp33_ = controller;
@@ -3327,16 +3340,17 @@ 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 3329 "MediaDataRepresentation.c"
+#line 3342 "MediaDataRepresentation.c"
 }
 
 
 static time_t media_source_real_get_exposure_time (MediaSource* self) {
+	time_t _tmp0_ = 0;
 #line 263 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	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 0;
-#line 3338 "MediaDataRepresentation.c"
+	return _tmp0_;
+#line 3352 "MediaDataRepresentation.c"
 }
 
 
@@ -3345,7 +3359,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 3347 "MediaDataRepresentation.c"
+#line 3361 "MediaDataRepresentation.c"
 }
 
 
@@ -3354,7 +3368,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 3356 "MediaDataRepresentation.c"
+#line 3370 "MediaDataRepresentation.c"
 }
 
 
@@ -3363,7 +3377,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 3365 "MediaDataRepresentation.c"
+#line 3379 "MediaDataRepresentation.c"
 }
 
 
@@ -3372,7 +3386,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 3374 "MediaDataRepresentation.c"
+#line 3388 "MediaDataRepresentation.c"
 }
 
 
@@ -3391,19 +3405,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 3393 "MediaDataRepresentation.c"
+#line 3407 "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 3399 "MediaDataRepresentation.c"
+#line 3413 "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 3405 "MediaDataRepresentation.c"
+#line 3419 "MediaDataRepresentation.c"
 }
 
 
@@ -3413,76 +3427,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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 3484 "MediaDataRepresentation.c"
+#line 3498 "MediaDataRepresentation.c"
 }
 
 
@@ -3491,7 +3505,7 @@ static void media_source_indexable_interface_init (IndexableIface * iface) {
 	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 3493 "MediaDataRepresentation.c"
+#line 3507 "MediaDataRepresentation.c"
 }
 
 
@@ -3502,7 +3516,7 @@ 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 3504 "MediaDataRepresentation.c"
+#line 3518 "MediaDataRepresentation.c"
 }
 
 
@@ -3516,7 +3530,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 3518 "MediaDataRepresentation.c"
+#line 3532 "MediaDataRepresentation.c"
 }
 
 
@@ -3539,7 +3553,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 3541 "MediaDataRepresentation.c"
+#line 3555 "MediaDataRepresentation.c"
 }
 
 
@@ -3548,7 +3562,7 @@ 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 3550 "MediaDataRepresentation.c"
+#line 3564 "MediaDataRepresentation.c"
 }
 
 
@@ -3575,14 +3589,14 @@ 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 3577 "MediaDataRepresentation.c"
+#line 3591 "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 3584 "MediaDataRepresentation.c"
+#line 3598 "MediaDataRepresentation.c"
 }
 
 
@@ -3605,7 +3619,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 3607 "MediaDataRepresentation.c"
+#line 3621 "MediaDataRepresentation.c"
 }
 
 
@@ -3615,7 +3629,7 @@ 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 3617 "MediaDataRepresentation.c"
+#line 3631 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeHashMap* _tmp0_ = NULL;
@@ -3627,7 +3641,7 @@ MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* sel
 #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = self->priv->master_file_map;
 #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-		_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+		_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = _tmp1_;
 #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3642,7 +3656,7 @@ 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 3644 "MediaDataRepresentation.c"
+#line 3658 "MediaDataRepresentation.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			MediaSource* source = NULL;
@@ -3661,7 +3675,7 @@ MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* sel
 			if (!_tmp7_) {
 #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 3663 "MediaDataRepresentation.c"
+#line 3677 "MediaDataRepresentation.c"
 			}
 #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = _source_it;
@@ -3689,28 +3703,28 @@ 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 3691 "MediaDataRepresentation.c"
+#line 3705 "MediaDataRepresentation.c"
 			}
 #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (source);
-#line 3695 "MediaDataRepresentation.c"
+#line 3709 "MediaDataRepresentation.c"
 		}
 #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_source_it);
-#line 3699 "MediaDataRepresentation.c"
+#line 3713 "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 3705 "MediaDataRepresentation.c"
+#line 3719 "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 3712 "MediaDataRepresentation.c"
+#line 3726 "MediaDataRepresentation.c"
 }
 
 
@@ -3730,7 +3744,7 @@ 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 3732 "MediaDataRepresentation.c"
+#line 3746 "MediaDataRepresentation.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp1_ = NULL;
@@ -3743,7 +3757,7 @@ 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 3745 "MediaDataRepresentation.c"
+#line 3759 "MediaDataRepresentation.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				DataSource* source = NULL;
@@ -3766,7 +3780,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 3768 "MediaDataRepresentation.c"
+#line 3782 "MediaDataRepresentation.c"
 				}
 #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp5_ = _source_it;
@@ -3802,18 +3816,18 @@ 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 3804 "MediaDataRepresentation.c"
+#line 3818 "MediaDataRepresentation.c"
 			}
 #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (_source_it);
-#line 3808 "MediaDataRepresentation.c"
+#line 3822 "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 3815 "MediaDataRepresentation.c"
+#line 3829 "MediaDataRepresentation.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp16_ = NULL;
@@ -3826,7 +3840,7 @@ 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 3828 "MediaDataRepresentation.c"
+#line 3842 "MediaDataRepresentation.c"
 				GeeIterator* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
 				DataSource* source = NULL;
@@ -3853,7 +3867,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 3855 "MediaDataRepresentation.c"
+#line 3869 "MediaDataRepresentation.c"
 				}
 #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp20_ = _source_it;
@@ -3897,11 +3911,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 3899 "MediaDataRepresentation.c"
+#line 3913 "MediaDataRepresentation.c"
 			}
 #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (_source_it);
-#line 3903 "MediaDataRepresentation.c"
+#line 3917 "MediaDataRepresentation.c"
 		}
 	}
 #line 310 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3910,7 +3924,7 @@ 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 3912 "MediaDataRepresentation.c"
+#line 3926 "MediaDataRepresentation.c"
 }
 
 
@@ -3948,7 +3962,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 3950 "MediaDataRepresentation.c"
+#line 3964 "MediaDataRepresentation.c"
 }
 
 
@@ -3960,8 +3974,8 @@ 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 = media_source_holding_tank_real_notify_contents_altered;
-#line 3963 "MediaDataRepresentation.c"
+	((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*)(SourceHoldingTank*, GeeCollection*, GeeCollection*)) media_source_holding_tank_real_notify_contents_altered;
+#line 3977 "MediaDataRepresentation.c"
 }
 
 
@@ -3970,10 +3984,10 @@ static void media_source_holding_tank_instance_init (MediaSourceHoldingTank * se
 #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, g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_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 3975 "MediaDataRepresentation.c"
+#line 3989 "MediaDataRepresentation.c"
 }
 
 
@@ -3985,7 +3999,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 3987 "MediaDataRepresentation.c"
+#line 4001 "MediaDataRepresentation.c"
 }
 
 
@@ -4004,7 +4018,7 @@ 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 4006 "MediaDataRepresentation.c"
+#line 4020 "MediaDataRepresentation.c"
 }
 
 
@@ -4026,14 +4040,14 @@ MediaSourceTransactionController* media_source_transaction_controller_construct
 	self->priv->sources = _tmp1_;
 #line 326 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self;
-#line 4028 "MediaDataRepresentation.c"
+#line 4042 "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 4035 "MediaDataRepresentation.c"
+#line 4049 "MediaDataRepresentation.c"
 }
 
 
@@ -4048,7 +4062,7 @@ 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 4050 "MediaDataRepresentation.c"
+#line 4064 "MediaDataRepresentation.c"
 }
 
 
@@ -4070,7 +4084,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 4072 "MediaDataRepresentation.c"
+#line 4086 "MediaDataRepresentation.c"
 	}
 }
 
@@ -4083,17 +4097,17 @@ 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 = 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 = media_source_transaction_controller_real_commit_impl;
-#line 4088 "MediaDataRepresentation.c"
+	((TransactionControllerClass *) klass)->commit_impl = (void (*)(TransactionController*, GError**)) media_source_transaction_controller_real_commit_impl;
+#line 4102 "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 4095 "MediaDataRepresentation.c"
+#line 4109 "MediaDataRepresentation.c"
 }
 
 
@@ -4105,7 +4119,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 4107 "MediaDataRepresentation.c"
+#line 4121 "MediaDataRepresentation.c"
 }
 
 
@@ -4126,7 +4140,7 @@ 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 4128 "MediaDataRepresentation.c"
+#line 4142 "MediaDataRepresentation.c"
 }
 
 
@@ -4161,7 +4175,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 4163 "MediaDataRepresentation.c"
+#line 4177 "MediaDataRepresentation.c"
 }
 
 
@@ -4172,7 +4186,7 @@ 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 4174 "MediaDataRepresentation.c"
+#line 4188 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
@@ -4185,7 +4199,7 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection*
 		_source_it = _tmp1_;
 #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 4187 "MediaDataRepresentation.c"
+#line 4201 "MediaDataRepresentation.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			MediaSource* source = NULL;
@@ -4201,7 +4215,7 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection*
 			if (!_tmp3_) {
 #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 4203 "MediaDataRepresentation.c"
+#line 4217 "MediaDataRepresentation.c"
 			}
 #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp4_ = _source_it;
@@ -4213,21 +4227,21 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection*
 			_tmp7_ = photos;
 #line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp7_ != NULL) {
-#line 4215 "MediaDataRepresentation.c"
+#line 4229 "MediaDataRepresentation.c"
 				MediaSource* _tmp8_ = NULL;
 #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 4221 "MediaDataRepresentation.c"
+#line 4235 "MediaDataRepresentation.c"
 			} else {
 #line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp6_ = FALSE;
-#line 4225 "MediaDataRepresentation.c"
+#line 4239 "MediaDataRepresentation.c"
 			}
 #line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp6_) {
-#line 4229 "MediaDataRepresentation.c"
+#line 4243 "MediaDataRepresentation.c"
 				GeeCollection* _tmp9_ = NULL;
 				MediaSource* _tmp10_ = NULL;
 #line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4236,7 +4250,7 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection*
 				_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 4238 "MediaDataRepresentation.c"
+#line 4252 "MediaDataRepresentation.c"
 			} else {
 				gboolean _tmp11_ = FALSE;
 				GeeCollection* _tmp12_ = NULL;
@@ -4244,21 +4258,21 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection*
 				_tmp12_ = videos;
 #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp12_ != NULL) {
-#line 4246 "MediaDataRepresentation.c"
+#line 4260 "MediaDataRepresentation.c"
 					MediaSource* _tmp13_ = NULL;
 #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 4252 "MediaDataRepresentation.c"
+#line 4266 "MediaDataRepresentation.c"
 				} else {
 #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp11_ = FALSE;
-#line 4256 "MediaDataRepresentation.c"
+#line 4270 "MediaDataRepresentation.c"
 				}
 #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp11_) {
-#line 4260 "MediaDataRepresentation.c"
+#line 4274 "MediaDataRepresentation.c"
 					GeeCollection* _tmp14_ = NULL;
 					MediaSource* _tmp15_ = NULL;
 #line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4267,7 +4281,7 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection*
 					_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 4269 "MediaDataRepresentation.c"
+#line 4283 "MediaDataRepresentation.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
 					GeeCollection* _tmp17_ = NULL;
@@ -4277,18 +4291,18 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection*
 					if (_tmp17_ != NULL) {
 #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp16_ = TRUE;
-#line 4279 "MediaDataRepresentation.c"
+#line 4293 "MediaDataRepresentation.c"
 					} else {
 						GeeCollection* _tmp18_ = NULL;
 #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp18_ = videos;
 #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp16_ = _tmp18_ != NULL;
-#line 4286 "MediaDataRepresentation.c"
+#line 4300 "MediaDataRepresentation.c"
 					}
 #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					if (_tmp16_) {
-#line 4290 "MediaDataRepresentation.c"
+#line 4304 "MediaDataRepresentation.c"
 						MediaSource* _tmp19_ = NULL;
 						gchar* _tmp20_ = NULL;
 						gchar* _tmp21_ = NULL;
@@ -4302,17 +4316,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 4304 "MediaDataRepresentation.c"
+#line 4318 "MediaDataRepresentation.c"
 					}
 				}
 			}
 #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (source);
-#line 4310 "MediaDataRepresentation.c"
+#line 4324 "MediaDataRepresentation.c"
 		}
 #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_source_it);
-#line 4314 "MediaDataRepresentation.c"
+#line 4328 "MediaDataRepresentation.c"
 	}
 }
 
@@ -4332,11 +4346,11 @@ void media_source_collection_count_media (GeeCollection* media, gint* photo_coun
 #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"
-	_tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	photos = _tmp0_;
 #line 404 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp1_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp1_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 404 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	videos = _tmp1_;
 #line 406 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4344,13 +4358,13 @@ void media_source_collection_count_media (GeeCollection* media, gint* photo_coun
 #line 406 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_collection_filter_media (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection));
 #line 408 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 408 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = _tmp3_;
 #line 408 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_vala_photo_count = _tmp4_;
 #line 409 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 409 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp6_ = _tmp5_;
 #line 409 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4363,13 +4377,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 4365 "MediaDataRepresentation.c"
+#line 4379 "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 4371 "MediaDataRepresentation.c"
+#line 4385 "MediaDataRepresentation.c"
 	}
 }
 
@@ -4378,7 +4392,7 @@ 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 4380 "MediaDataRepresentation.c"
+#line 4394 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _current_media_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
@@ -4391,7 +4405,7 @@ gboolean media_source_collection_has_photo (GeeCollection* media) {
 		_current_media_it = _tmp1_;
 #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 4393 "MediaDataRepresentation.c"
+#line 4407 "MediaDataRepresentation.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			MediaSource* current_media = NULL;
@@ -4406,7 +4420,7 @@ gboolean media_source_collection_has_photo (GeeCollection* media) {
 			if (!_tmp3_) {
 #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 4408 "MediaDataRepresentation.c"
+#line 4422 "MediaDataRepresentation.c"
 			}
 #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp4_ = _current_media_it;
@@ -4426,21 +4440,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 4428 "MediaDataRepresentation.c"
+#line 4442 "MediaDataRepresentation.c"
 			}
 #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (current_media);
-#line 4432 "MediaDataRepresentation.c"
+#line 4446 "MediaDataRepresentation.c"
 		}
 #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_current_media_it);
-#line 4436 "MediaDataRepresentation.c"
+#line 4450 "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 4442 "MediaDataRepresentation.c"
+#line 4456 "MediaDataRepresentation.c"
 }
 
 
@@ -4448,7 +4462,7 @@ 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 4450 "MediaDataRepresentation.c"
+#line 4464 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _current_media_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
@@ -4461,7 +4475,7 @@ gboolean media_source_collection_has_video (GeeCollection* media) {
 		_current_media_it = _tmp1_;
 #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 4463 "MediaDataRepresentation.c"
+#line 4477 "MediaDataRepresentation.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			MediaSource* current_media = NULL;
@@ -4476,7 +4490,7 @@ gboolean media_source_collection_has_video (GeeCollection* media) {
 			if (!_tmp3_) {
 #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 4478 "MediaDataRepresentation.c"
+#line 4492 "MediaDataRepresentation.c"
 			}
 #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp4_ = _current_media_it;
@@ -4496,21 +4510,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 4498 "MediaDataRepresentation.c"
+#line 4512 "MediaDataRepresentation.c"
 			}
 #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (current_media);
-#line 4502 "MediaDataRepresentation.c"
+#line 4516 "MediaDataRepresentation.c"
 		}
 #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_current_media_it);
-#line 4506 "MediaDataRepresentation.c"
+#line 4520 "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 4512 "MediaDataRepresentation.c"
+#line 4526 "MediaDataRepresentation.c"
 }
 
 
@@ -4519,7 +4533,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 4521 "MediaDataRepresentation.c"
+#line 4535 "MediaDataRepresentation.c"
 }
 
 
@@ -4528,7 +4542,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 4530 "MediaDataRepresentation.c"
+#line 4544 "MediaDataRepresentation.c"
 }
 
 
@@ -4537,7 +4551,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 4539 "MediaDataRepresentation.c"
+#line 4553 "MediaDataRepresentation.c"
 }
 
 
@@ -4546,7 +4560,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 4548 "MediaDataRepresentation.c"
+#line 4562 "MediaDataRepresentation.c"
 }
 
 
@@ -4555,7 +4569,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 4557 "MediaDataRepresentation.c"
+#line 4571 "MediaDataRepresentation.c"
 }
 
 
@@ -4564,7 +4578,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 4566 "MediaDataRepresentation.c"
+#line 4580 "MediaDataRepresentation.c"
 }
 
 
@@ -4573,7 +4587,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 4575 "MediaDataRepresentation.c"
+#line 4589 "MediaDataRepresentation.c"
 }
 
 
@@ -4582,16 +4596,17 @@ 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 4584 "MediaDataRepresentation.c"
+#line 4598 "MediaDataRepresentation.c"
 }
 
 
 static gboolean media_source_collection_real_is_file_recognized (MediaSourceCollection* self, GFile* file) {
+	gboolean _tmp0_ = FALSE;
 #line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	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 FALSE;
-#line 4593 "MediaDataRepresentation.c"
+	return _tmp0_;
+#line 4608 "MediaDataRepresentation.c"
 }
 
 
@@ -4600,14 +4615,14 @@ 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 4602 "MediaDataRepresentation.c"
+#line 4617 "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 4609 "MediaDataRepresentation.c"
+#line 4624 "MediaDataRepresentation.c"
 }
 
 
@@ -4625,7 +4640,7 @@ MediaSourceHoldingTank* media_source_collection_get_trashcan (MediaSourceCollect
 	result = _tmp1_;
 #line 443 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 4627 "MediaDataRepresentation.c"
+#line 4642 "MediaDataRepresentation.c"
 }
 
 
@@ -4643,7 +4658,7 @@ MediaSourceHoldingTank* media_source_collection_get_offline_bin (MediaSourceColl
 	result = _tmp1_;
 #line 447 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 4645 "MediaDataRepresentation.c"
+#line 4660 "MediaDataRepresentation.c"
 }
 
 
@@ -4652,7 +4667,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 4654 "MediaDataRepresentation.c"
+#line 4669 "MediaDataRepresentation.c"
 }
 
 
@@ -4661,14 +4676,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 4663 "MediaDataRepresentation.c"
+#line 4678 "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 4670 "MediaDataRepresentation.c"
+#line 4685 "MediaDataRepresentation.c"
 }
 
 
@@ -4677,14 +4692,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 4679 "MediaDataRepresentation.c"
+#line 4694 "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 4686 "MediaDataRepresentation.c"
+#line 4701 "MediaDataRepresentation.c"
 }
 
 
@@ -4693,7 +4708,7 @@ 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 4695 "MediaDataRepresentation.c"
+#line 4710 "MediaDataRepresentation.c"
 }
 
 
@@ -4705,7 +4720,7 @@ static void media_source_collection_real_notify_media_import_starting (MediaSour
 	_tmp0_ = media;
 #line 464 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_emit_by_name (self, "media-import-starting", _tmp0_);
-#line 4707 "MediaDataRepresentation.c"
+#line 4722 "MediaDataRepresentation.c"
 }
 
 
@@ -4714,7 +4729,7 @@ 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 4716 "MediaDataRepresentation.c"
+#line 4731 "MediaDataRepresentation.c"
 }
 
 
@@ -4726,7 +4741,7 @@ static void media_source_collection_real_notify_media_import_completed (MediaSou
 	_tmp0_ = media;
 #line 468 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_emit_by_name (self, "media-import-completed", _tmp0_);
-#line 4728 "MediaDataRepresentation.c"
+#line 4743 "MediaDataRepresentation.c"
 }
 
 
@@ -4735,7 +4750,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 4737 "MediaDataRepresentation.c"
+#line 4752 "MediaDataRepresentation.c"
 }
 
 
@@ -4758,7 +4773,7 @@ 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 4760 "MediaDataRepresentation.c"
+#line 4775 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -4785,7 +4800,7 @@ 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 4787 "MediaDataRepresentation.c"
+#line 4802 "MediaDataRepresentation.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			DataObject* object = NULL;
@@ -4818,7 +4833,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 4820 "MediaDataRepresentation.c"
+#line 4835 "MediaDataRepresentation.c"
 			}
 #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = _object_it;
@@ -4854,7 +4869,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 4856 "MediaDataRepresentation.c"
+#line 4871 "MediaDataRepresentation.c"
 			}
 #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp18_ = source;
@@ -4862,7 +4877,7 @@ 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 4864 "MediaDataRepresentation.c"
+#line 4879 "MediaDataRepresentation.c"
 				MediaSourceHoldingTank* _tmp20_ = NULL;
 				MediaSourceHoldingTank* _tmp21_ = NULL;
 				MediaSource* _tmp22_ = NULL;
@@ -4879,15 +4894,15 @@ 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 4881 "MediaDataRepresentation.c"
+#line 4896 "MediaDataRepresentation.c"
 			} else {
 #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp17_ = FALSE;
-#line 4885 "MediaDataRepresentation.c"
+#line 4900 "MediaDataRepresentation.c"
 			}
 #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp17_) {
-#line 4889 "MediaDataRepresentation.c"
+#line 4904 "MediaDataRepresentation.c"
 				GeeArrayList* _tmp24_ = NULL;
 				GeeArrayList* _tmp26_ = NULL;
 				MediaSource* _tmp27_ = NULL;
@@ -4895,15 +4910,15 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 				_tmp24_ = to_trashcan;
 #line 483 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp24_ == NULL) {
-#line 4897 "MediaDataRepresentation.c"
+#line 4912 "MediaDataRepresentation.c"
 					GeeArrayList* _tmp25_ = NULL;
 #line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-					_tmp25_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_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 4905 "MediaDataRepresentation.c"
+#line 4920 "MediaDataRepresentation.c"
 				}
 #line 486 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp26_ = to_trashcan;
@@ -4919,7 +4934,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 4921 "MediaDataRepresentation.c"
+#line 4936 "MediaDataRepresentation.c"
 			}
 #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp29_ = source;
@@ -4927,7 +4942,7 @@ 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 4929 "MediaDataRepresentation.c"
+#line 4944 "MediaDataRepresentation.c"
 				MediaSourceHoldingTank* _tmp31_ = NULL;
 				MediaSourceHoldingTank* _tmp32_ = NULL;
 				MediaSource* _tmp33_ = NULL;
@@ -4944,15 +4959,15 @@ 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 4946 "MediaDataRepresentation.c"
+#line 4961 "MediaDataRepresentation.c"
 			} else {
 #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp28_ = FALSE;
-#line 4950 "MediaDataRepresentation.c"
+#line 4965 "MediaDataRepresentation.c"
 			}
 #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp28_) {
-#line 4954 "MediaDataRepresentation.c"
+#line 4969 "MediaDataRepresentation.c"
 				GeeArrayList* _tmp35_ = NULL;
 				GeeArrayList* _tmp37_ = NULL;
 				MediaSource* _tmp38_ = NULL;
@@ -4960,15 +4975,15 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 				_tmp35_ = to_offline;
 #line 493 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp35_ == NULL) {
-#line 4962 "MediaDataRepresentation.c"
+#line 4977 "MediaDataRepresentation.c"
 					GeeArrayList* _tmp36_ = NULL;
 #line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-					_tmp36_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_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 4970 "MediaDataRepresentation.c"
+#line 4985 "MediaDataRepresentation.c"
 				}
 #line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp37_ = to_offline;
@@ -4976,7 +4991,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 4978 "MediaDataRepresentation.c"
+#line 4993 "MediaDataRepresentation.c"
 			}
 #line 499 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp39_ = source;
@@ -4988,7 +5003,7 @@ 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 4990 "MediaDataRepresentation.c"
+#line 5005 "MediaDataRepresentation.c"
 				Flaggable* _tmp42_ = NULL;
 				gboolean _tmp43_ = FALSE;
 #line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -4997,7 +5012,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 				_tmp43_ = flaggable_is_flagged (_tmp42_);
 #line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp43_) {
-#line 4999 "MediaDataRepresentation.c"
+#line 5014 "MediaDataRepresentation.c"
 					gboolean _tmp44_ = FALSE;
 					GeeSet* _tmp45_ = NULL;
 					MediaSource* _tmp46_ = NULL;
@@ -5012,18 +5027,18 @@ 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 5014 "MediaDataRepresentation.c"
+#line 5029 "MediaDataRepresentation.c"
 					} else {
 						gboolean _tmp48_ = FALSE;
 #line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp48_ = flagged_altered;
 #line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp44_ = _tmp48_;
-#line 5021 "MediaDataRepresentation.c"
+#line 5036 "MediaDataRepresentation.c"
 					}
 #line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					flagged_altered = _tmp44_;
-#line 5025 "MediaDataRepresentation.c"
+#line 5040 "MediaDataRepresentation.c"
 				} else {
 					gboolean _tmp49_ = FALSE;
 					GeeSet* _tmp50_ = NULL;
@@ -5039,18 +5054,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 5041 "MediaDataRepresentation.c"
+#line 5056 "MediaDataRepresentation.c"
 					} else {
 						gboolean _tmp53_ = FALSE;
 #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp53_ = flagged_altered;
 #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp49_ = _tmp53_;
-#line 5048 "MediaDataRepresentation.c"
+#line 5063 "MediaDataRepresentation.c"
 					}
 #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					flagged_altered = _tmp49_;
-#line 5052 "MediaDataRepresentation.c"
+#line 5067 "MediaDataRepresentation.c"
 				}
 			}
 #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5061,17 +5076,17 @@ 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 5063 "MediaDataRepresentation.c"
+#line 5078 "MediaDataRepresentation.c"
 		}
 #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_object_it);
-#line 5067 "MediaDataRepresentation.c"
+#line 5082 "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 5073 "MediaDataRepresentation.c"
+#line 5088 "MediaDataRepresentation.c"
 		MediaSourceHoldingTank* _tmp55_ = NULL;
 		MediaSourceHoldingTank* _tmp56_ = NULL;
 		GeeArrayList* _tmp57_ = NULL;
@@ -5085,13 +5100,13 @@ 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 5087 "MediaDataRepresentation.c"
+#line 5102 "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 5093 "MediaDataRepresentation.c"
+#line 5108 "MediaDataRepresentation.c"
 		MediaSourceHoldingTank* _tmp59_ = NULL;
 		MediaSourceHoldingTank* _tmp60_ = NULL;
 		GeeArrayList* _tmp61_ = NULL;
@@ -5105,7 +5120,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 5107 "MediaDataRepresentation.c"
+#line 5122 "MediaDataRepresentation.c"
 	}
 #line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp62_ = flagged_altered;
@@ -5113,7 +5128,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 5115 "MediaDataRepresentation.c"
+#line 5130 "MediaDataRepresentation.c"
 	}
 #line 517 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp63_ = items;
@@ -5123,14 +5138,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 5125 "MediaDataRepresentation.c"
+#line 5140 "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 5132 "MediaDataRepresentation.c"
+#line 5147 "MediaDataRepresentation.c"
 }
 
 
@@ -5158,7 +5173,7 @@ 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 5160 "MediaDataRepresentation.c"
+#line 5175 "MediaDataRepresentation.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp1_ = NULL;
@@ -5171,7 +5186,7 @@ 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 5173 "MediaDataRepresentation.c"
+#line 5188 "MediaDataRepresentation.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				DataObject* object = NULL;
@@ -5202,7 +5217,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 				if (!_tmp4_) {
 #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					break;
-#line 5204 "MediaDataRepresentation.c"
+#line 5219 "MediaDataRepresentation.c"
 				}
 #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp5_ = _object_it;
@@ -5244,7 +5259,7 @@ 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 5246 "MediaDataRepresentation.c"
+#line 5261 "MediaDataRepresentation.c"
 					GeeTreeSet* _tmp18_ = NULL;
 					ImportID _tmp19_ = {0};
 					GeeMultiMap* _tmp20_ = NULL;
@@ -5266,7 +5281,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 5268 "MediaDataRepresentation.c"
+#line 5283 "MediaDataRepresentation.c"
 				}
 #line 539 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp23_ = media;
@@ -5278,7 +5293,7 @@ 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 5280 "MediaDataRepresentation.c"
+#line 5295 "MediaDataRepresentation.c"
 					Flaggable* _tmp26_ = NULL;
 					gboolean _tmp27_ = FALSE;
 #line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5287,7 +5302,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 					_tmp27_ = flaggable_is_flagged (_tmp26_);
 #line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					if (_tmp27_) {
-#line 5289 "MediaDataRepresentation.c"
+#line 5304 "MediaDataRepresentation.c"
 						gboolean _tmp28_ = FALSE;
 						GeeSet* _tmp29_ = NULL;
 						MediaSource* _tmp30_ = NULL;
@@ -5302,18 +5317,18 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 						if (_tmp31_) {
 #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 							_tmp28_ = TRUE;
-#line 5304 "MediaDataRepresentation.c"
+#line 5319 "MediaDataRepresentation.c"
 						} else {
 							gboolean _tmp32_ = FALSE;
 #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 							_tmp32_ = flagged_altered;
 #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 							_tmp28_ = _tmp32_;
-#line 5311 "MediaDataRepresentation.c"
+#line 5326 "MediaDataRepresentation.c"
 						}
 #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						flagged_altered = _tmp28_;
-#line 5315 "MediaDataRepresentation.c"
+#line 5330 "MediaDataRepresentation.c"
 					} else {
 						gboolean _tmp33_ = FALSE;
 						GeeSet* _tmp34_ = NULL;
@@ -5329,18 +5344,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 5331 "MediaDataRepresentation.c"
+#line 5346 "MediaDataRepresentation.c"
 						} else {
 							gboolean _tmp37_ = FALSE;
 #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 							_tmp37_ = flagged_altered;
 #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 							_tmp33_ = _tmp37_;
-#line 5338 "MediaDataRepresentation.c"
+#line 5353 "MediaDataRepresentation.c"
 						}
 #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						flagged_altered = _tmp33_;
-#line 5342 "MediaDataRepresentation.c"
+#line 5357 "MediaDataRepresentation.c"
 					}
 				}
 #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5349,18 +5364,18 @@ 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 5351 "MediaDataRepresentation.c"
+#line 5366 "MediaDataRepresentation.c"
 			}
 #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (_object_it);
-#line 5355 "MediaDataRepresentation.c"
+#line 5370 "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 5362 "MediaDataRepresentation.c"
+#line 5377 "MediaDataRepresentation.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp39_ = NULL;
@@ -5373,7 +5388,7 @@ 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 5375 "MediaDataRepresentation.c"
+#line 5390 "MediaDataRepresentation.c"
 				GeeIterator* _tmp41_ = NULL;
 				gboolean _tmp42_ = FALSE;
 				DataObject* object = NULL;
@@ -5408,7 +5423,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 				if (!_tmp42_) {
 #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					break;
-#line 5410 "MediaDataRepresentation.c"
+#line 5425 "MediaDataRepresentation.c"
 				}
 #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp43_ = _object_it;
@@ -5458,7 +5473,7 @@ 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 5460 "MediaDataRepresentation.c"
+#line 5475 "MediaDataRepresentation.c"
 					GeeMultiMap* _tmp59_ = NULL;
 					ImportID _tmp60_ = {0};
 					MediaSource* _tmp61_ = NULL;
@@ -5489,7 +5504,7 @@ 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 5491 "MediaDataRepresentation.c"
+#line 5506 "MediaDataRepresentation.c"
 						GeeTreeSet* _tmp67_ = NULL;
 						ImportID _tmp68_ = {0};
 #line 562 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5498,11 +5513,11 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 						_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 5500 "MediaDataRepresentation.c"
+#line 5515 "MediaDataRepresentation.c"
 					}
 #line 564 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					import_roll_changed = TRUE;
-#line 5504 "MediaDataRepresentation.c"
+#line 5519 "MediaDataRepresentation.c"
 				}
 #line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp70_ = self->priv->flagged;
@@ -5514,14 +5529,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 5516 "MediaDataRepresentation.c"
+#line 5531 "MediaDataRepresentation.c"
 				} else {
 					gboolean _tmp73_ = FALSE;
 #line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp73_ = flagged_altered;
 #line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp69_ = _tmp73_;
-#line 5523 "MediaDataRepresentation.c"
+#line 5538 "MediaDataRepresentation.c"
 				}
 #line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				flagged_altered = _tmp69_;
@@ -5529,11 +5544,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 5531 "MediaDataRepresentation.c"
+#line 5546 "MediaDataRepresentation.c"
 			}
 #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (_object_it);
-#line 5535 "MediaDataRepresentation.c"
+#line 5550 "MediaDataRepresentation.c"
 		}
 	}
 #line 571 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5542,7 +5557,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 5544 "MediaDataRepresentation.c"
+#line 5559 "MediaDataRepresentation.c"
 	}
 #line 574 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp75_ = flagged_altered;
@@ -5550,7 +5565,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 5552 "MediaDataRepresentation.c"
+#line 5567 "MediaDataRepresentation.c"
 	}
 #line 577 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp76_ = added;
@@ -5558,7 +5573,7 @@ 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 5560 "MediaDataRepresentation.c"
+#line 5575 "MediaDataRepresentation.c"
 }
 
 
@@ -5607,7 +5622,7 @@ static void media_source_collection_on_master_replaced (MediaSourceCollection* s
 	_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 5609 "MediaDataRepresentation.c"
+#line 5624 "MediaDataRepresentation.c"
 }
 
 
@@ -5630,7 +5645,7 @@ MediaSource* media_source_collection_fetch_by_master_file (MediaSourceCollection
 	result = (MediaSource*) _tmp2_;
 #line 590 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5632 "MediaDataRepresentation.c"
+#line 5647 "MediaDataRepresentation.c"
 }
 
 
@@ -5671,7 +5686,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 5673 "MediaDataRepresentation.c"
+#line 5688 "MediaDataRepresentation.c"
 }
 
 
@@ -5680,7 +5695,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 5682 "MediaDataRepresentation.c"
+#line 5697 "MediaDataRepresentation.c"
 }
 
 
@@ -5689,7 +5704,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 5691 "MediaDataRepresentation.c"
+#line 5706 "MediaDataRepresentation.c"
 }
 
 
@@ -5698,7 +5713,7 @@ 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 5700 "MediaDataRepresentation.c"
+#line 5715 "MediaDataRepresentation.c"
 }
 
 
@@ -5724,7 +5739,7 @@ GeeCollection* media_source_collection_get_trashcan_contents (MediaSourceCollect
 	result = _tmp3_;
 #line 603 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5726 "MediaDataRepresentation.c"
+#line 5741 "MediaDataRepresentation.c"
 }
 
 
@@ -5750,7 +5765,7 @@ GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceColl
 	result = _tmp3_;
 #line 607 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5752 "MediaDataRepresentation.c"
+#line 5767 "MediaDataRepresentation.c"
 }
 
 
@@ -5771,7 +5786,7 @@ 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 5773 "MediaDataRepresentation.c"
+#line 5788 "MediaDataRepresentation.c"
 }
 
 
@@ -5789,7 +5804,7 @@ GeeSortedSet* media_source_collection_get_import_roll_ids (MediaSourceCollection
 	result = _tmp1_;
 #line 616 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5791 "MediaDataRepresentation.c"
+#line 5806 "MediaDataRepresentation.c"
 }
 
 
@@ -5804,12 +5819,12 @@ ImportID* media_source_collection_get_last_import_id (MediaSourceCollection* sel
 #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = self->priv->sorted_import_ids;
 #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = _tmp2_;
 #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp3_ != 0) {
-#line 5811 "MediaDataRepresentation.c"
+#line 5826 "MediaDataRepresentation.c"
 		GeeTreeSet* _tmp4_ = NULL;
 		gpointer _tmp5_ = NULL;
 #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -5820,19 +5835,19 @@ 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 5822 "MediaDataRepresentation.c"
+#line 5837 "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 5828 "MediaDataRepresentation.c"
+#line 5843 "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 5834 "MediaDataRepresentation.c"
+#line 5849 "MediaDataRepresentation.c"
 }
 
 
@@ -5855,7 +5870,7 @@ GeeCollection* media_source_collection_get_import_roll (MediaSourceCollection* s
 	result = _tmp2_;
 #line 624 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5857 "MediaDataRepresentation.c"
+#line 5872 "MediaDataRepresentation.c"
 }
 
 
@@ -5877,7 +5892,7 @@ 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 5879 "MediaDataRepresentation.c"
+#line 5894 "MediaDataRepresentation.c"
 }
 
 
@@ -5899,7 +5914,7 @@ 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 5901 "MediaDataRepresentation.c"
+#line 5916 "MediaDataRepresentation.c"
 }
 
 
@@ -5925,7 +5940,7 @@ gint media_source_collection_get_trashcan_count (MediaSourceCollection* self) {
 	result = _tmp3_;
 #line 636 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5927 "MediaDataRepresentation.c"
+#line 5942 "MediaDataRepresentation.c"
 }
 
 
@@ -5958,7 +5973,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 5960 "MediaDataRepresentation.c"
+#line 5975 "MediaDataRepresentation.c"
 }
 
 
@@ -5967,14 +5982,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 5969 "MediaDataRepresentation.c"
+#line 5984 "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 5976 "MediaDataRepresentation.c"
+#line 5991 "MediaDataRepresentation.c"
 }
 
 
@@ -5983,7 +5998,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 5985 "MediaDataRepresentation.c"
+#line 6000 "MediaDataRepresentation.c"
 }
 
 
@@ -5992,7 +6007,7 @@ 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 5994 "MediaDataRepresentation.c"
+#line 6009 "MediaDataRepresentation.c"
 }
 
 
@@ -6051,39 +6066,39 @@ 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 6053 "MediaDataRepresentation.c"
+#line 6068 "MediaDataRepresentation.c"
 		GeeHashSet* _tmp3_ = NULL;
 #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-		_tmp3_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+		_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 6061 "MediaDataRepresentation.c"
+#line 6076 "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 6067 "MediaDataRepresentation.c"
+#line 6082 "MediaDataRepresentation.c"
 	}
 #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = _g_object_ref0 (_tmp1_);
 #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	to_tombstone = _tmp4_;
 #line 667 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp5_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp5_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 667 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	trashed = _tmp5_;
 #line 668 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp6_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp6_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 668 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	offlined = _tmp6_;
 #line 669 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp7_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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 6085 "MediaDataRepresentation.c"
+#line 6100 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp8_ = NULL;
@@ -6096,7 +6111,7 @@ 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 6098 "MediaDataRepresentation.c"
+#line 6113 "MediaDataRepresentation.c"
 			GeeIterator* _tmp10_ = NULL;
 			gboolean _tmp11_ = FALSE;
 			MediaSource* source = NULL;
@@ -6113,7 +6128,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 			if (!_tmp11_) {
 #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 6115 "MediaDataRepresentation.c"
+#line 6130 "MediaDataRepresentation.c"
 			}
 #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp12_ = _source_it;
@@ -6127,7 +6142,7 @@ 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 6129 "MediaDataRepresentation.c"
+#line 6144 "MediaDataRepresentation.c"
 				GeeArrayList* _tmp16_ = NULL;
 				MediaSource* _tmp17_ = NULL;
 #line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6136,7 +6151,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 				_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 6138 "MediaDataRepresentation.c"
+#line 6153 "MediaDataRepresentation.c"
 			} else {
 				MediaSource* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
@@ -6146,7 +6161,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 				_tmp19_ = media_source_is_offline (_tmp18_);
 #line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp19_) {
-#line 6148 "MediaDataRepresentation.c"
+#line 6163 "MediaDataRepresentation.c"
 					GeeArrayList* _tmp20_ = NULL;
 					MediaSource* _tmp21_ = NULL;
 #line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6155,7 +6170,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 					_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 6157 "MediaDataRepresentation.c"
+#line 6172 "MediaDataRepresentation.c"
 				} else {
 					GeeArrayList* _tmp22_ = NULL;
 					MediaSource* _tmp23_ = NULL;
@@ -6165,14 +6180,14 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 					_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 6167 "MediaDataRepresentation.c"
+#line 6182 "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 6174 "MediaDataRepresentation.c"
+#line 6189 "MediaDataRepresentation.c"
 				GeeHashSet* _tmp25_ = NULL;
 				MediaSource* _tmp26_ = NULL;
 #line 679 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6181,15 +6196,15 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 				_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 6183 "MediaDataRepresentation.c"
+#line 6198 "MediaDataRepresentation.c"
 			}
 #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (source);
-#line 6187 "MediaDataRepresentation.c"
+#line 6202 "MediaDataRepresentation.c"
 		}
 #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_source_it);
-#line 6191 "MediaDataRepresentation.c"
+#line 6206 "MediaDataRepresentation.c"
 	}
 #line 682 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp27_ = sources;
@@ -6204,19 +6219,19 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 #line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp31_ = trashed;
 #line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp32_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp32_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp33_ = _tmp32_;
 #line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp34_ = offlined;
 #line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp35_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp35_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp36_ = _tmp35_;
 #line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp37_ = not_trashed;
 #line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp38_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp38_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp39_ = _tmp38_;
 #line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6229,7 +6244,7 @@ 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 6231 "MediaDataRepresentation.c"
+#line 6246 "MediaDataRepresentation.c"
 		gint _tmp41_ = 0;
 		ProgressMonitor _tmp42_ = NULL;
 		void* _tmp42__target = NULL;
@@ -6253,17 +6268,17 @@ 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 6255 "MediaDataRepresentation.c"
+#line 6270 "MediaDataRepresentation.c"
 	}
 #line 692 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp45_ = trashed;
 #line 692 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp46_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp46_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 692 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp47_ = _tmp46_;
 #line 692 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp47_ > 0) {
-#line 6265 "MediaDataRepresentation.c"
+#line 6280 "MediaDataRepresentation.c"
 		MediaSourceHoldingTank* _tmp48_ = NULL;
 		MediaSourceHoldingTank* _tmp49_ = NULL;
 		GeeArrayList* _tmp50_ = NULL;
@@ -6289,17 +6304,17 @@ 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 6291 "MediaDataRepresentation.c"
+#line 6306 "MediaDataRepresentation.c"
 	}
 #line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp54_ = offlined;
 #line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp55_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp55_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp56_ = _tmp55_;
 #line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp56_ > 0) {
-#line 6301 "MediaDataRepresentation.c"
+#line 6316 "MediaDataRepresentation.c"
 		MediaSourceHoldingTank* _tmp57_ = NULL;
 		MediaSourceHoldingTank* _tmp58_ = NULL;
 		GeeArrayList* _tmp59_ = NULL;
@@ -6325,17 +6340,17 @@ 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 6327 "MediaDataRepresentation.c"
+#line 6342 "MediaDataRepresentation.c"
 	}
 #line 699 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp63_ = not_trashed;
 #line 699 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp64_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp64_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 699 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp65_ = _tmp64_;
 #line 699 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp65_ > 0) {
-#line 6337 "MediaDataRepresentation.c"
+#line 6352 "MediaDataRepresentation.c"
 		GeeArrayList* _tmp66_ = NULL;
 		Marker* _tmp67_ = NULL;
 		Marker* _tmp68_ = NULL;
@@ -6361,33 +6376,33 @@ 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 6363 "MediaDataRepresentation.c"
+#line 6378 "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 6369 "MediaDataRepresentation.c"
+#line 6384 "MediaDataRepresentation.c"
 		GeeHashSet* _tmp74_ = NULL;
 		gint _tmp75_ = 0;
 		gint _tmp76_ = 0;
 #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp74_ = to_tombstone;
 #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-		_tmp75_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp75_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp76_ = _tmp75_;
 #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp72_ = _tmp76_ > 0;
-#line 6381 "MediaDataRepresentation.c"
+#line 6396 "MediaDataRepresentation.c"
 	} else {
 #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp72_ = FALSE;
-#line 6385 "MediaDataRepresentation.c"
+#line 6400 "MediaDataRepresentation.c"
 	}
 #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp72_) {
-#line 6389 "MediaDataRepresentation.c"
+#line 6404 "MediaDataRepresentation.c"
 		{
 			GeeHashSet* _tmp77_ = NULL;
 #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6398,7 +6413,7 @@ 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 6400 "MediaDataRepresentation.c"
+#line 6415 "MediaDataRepresentation.c"
 					goto __catch564_database_error;
 				}
 #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6419,7 +6434,7 @@ 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 6421 "MediaDataRepresentation.c"
+#line 6436 "MediaDataRepresentation.c"
 			}
 		}
 		goto __finally564;
@@ -6437,7 +6452,7 @@ 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 6439 "MediaDataRepresentation.c"
+#line 6454 "MediaDataRepresentation.c"
 		}
 		__finally564:
 #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6460,7 +6475,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 6462 "MediaDataRepresentation.c"
+#line 6477 "MediaDataRepresentation.c"
 		}
 	}
 #line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6475,7 +6490,7 @@ 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 6477 "MediaDataRepresentation.c"
+#line 6492 "MediaDataRepresentation.c"
 }
 
 
@@ -6502,7 +6517,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 	total_count = _tmp2_;
 #line 716 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	i = 1;
-#line 6504 "MediaDataRepresentation.c"
+#line 6519 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp3_ = NULL;
@@ -6515,7 +6530,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 		_source_it = _tmp4_;
 #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 6517 "MediaDataRepresentation.c"
+#line 6532 "MediaDataRepresentation.c"
 			GeeIterator* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
 			MediaSource* source = NULL;
@@ -6540,7 +6555,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 			if (!_tmp6_) {
 #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 6542 "MediaDataRepresentation.c"
+#line 6557 "MediaDataRepresentation.c"
 			}
 #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = _source_it;
@@ -6554,7 +6569,7 @@ 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 6556 "MediaDataRepresentation.c"
+#line 6571 "MediaDataRepresentation.c"
 			{
 				GFile* _tmp11_ = NULL;
 #line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6563,7 +6578,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 				g_file_delete (_tmp11_, NULL, &_inner_error_);
 #line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6565 "MediaDataRepresentation.c"
+#line 6580 "MediaDataRepresentation.c"
 					goto __catch565_g_error;
 				}
 			}
@@ -6596,7 +6611,7 @@ 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 6598 "MediaDataRepresentation.c"
+#line 6613 "MediaDataRepresentation.c"
 			}
 			__finally565:
 #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6613,7 +6628,7 @@ 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 6615 "MediaDataRepresentation.c"
+#line 6630 "MediaDataRepresentation.c"
 			}
 #line 727 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp17_ = file;
@@ -6625,21 +6640,21 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 			_tmp20_ = deleted;
 #line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp20_) {
-#line 6627 "MediaDataRepresentation.c"
+#line 6642 "MediaDataRepresentation.c"
 				GeeList* _tmp21_ = NULL;
 #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 6633 "MediaDataRepresentation.c"
+#line 6648 "MediaDataRepresentation.c"
 			} else {
 #line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp19_ = FALSE;
-#line 6637 "MediaDataRepresentation.c"
+#line 6652 "MediaDataRepresentation.c"
 			}
 #line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp19_) {
-#line 6641 "MediaDataRepresentation.c"
+#line 6656 "MediaDataRepresentation.c"
 				GeeList* _tmp22_ = NULL;
 				MediaSource* _tmp23_ = NULL;
 #line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6648,7 +6663,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 				_tmp23_ = source;
 #line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
-#line 6650 "MediaDataRepresentation.c"
+#line 6665 "MediaDataRepresentation.c"
 			}
 #line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp24_ = monitor;
@@ -6656,7 +6671,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 			_tmp24__target = monitor_target;
 #line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp24_ != NULL) {
-#line 6658 "MediaDataRepresentation.c"
+#line 6673 "MediaDataRepresentation.c"
 				ProgressMonitor _tmp25_ = NULL;
 				void* _tmp25__target = NULL;
 				gint _tmp26_ = 0;
@@ -6671,7 +6686,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 				_tmp27_ = total_count;
 #line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp25_ ((guint64) _tmp26_, (guint64) _tmp27_, TRUE, _tmp25__target);
-#line 6673 "MediaDataRepresentation.c"
+#line 6688 "MediaDataRepresentation.c"
 			}
 #line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp28_ = i;
@@ -6681,11 +6696,11 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 			_g_object_unref0 (file);
 #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (source);
-#line 6683 "MediaDataRepresentation.c"
+#line 6698 "MediaDataRepresentation.c"
 		}
 #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_source_it);
-#line 6687 "MediaDataRepresentation.c"
+#line 6702 "MediaDataRepresentation.c"
 	}
 }
 
@@ -6695,21 +6710,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 6697 "MediaDataRepresentation.c"
+#line 6712 "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 6704 "MediaDataRepresentation.c"
+#line 6719 "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 6711 "MediaDataRepresentation.c"
+#line 6726 "MediaDataRepresentation.c"
 }
 
 
@@ -6720,7 +6735,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 6722 "MediaDataRepresentation.c"
+#line 6737 "MediaDataRepresentation.c"
 }
 
 
@@ -6739,19 +6754,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 6741 "MediaDataRepresentation.c"
+#line 6756 "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 6747 "MediaDataRepresentation.c"
+#line 6762 "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 6753 "MediaDataRepresentation.c"
+#line 6768 "MediaDataRepresentation.c"
 }
 
 
@@ -6760,7 +6775,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 6762 "MediaDataRepresentation.c"
+#line 6777 "MediaDataRepresentation.c"
 }
 
 
@@ -6773,7 +6788,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 6775 "MediaDataRepresentation.c"
+#line 6790 "MediaDataRepresentation.c"
 }
 
 
@@ -6789,37 +6804,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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -6848,7 +6863,7 @@ static void media_source_collection_class_init (MediaSourceCollectionClass * kla
 	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 6850 "MediaDataRepresentation.c"
+#line 6865 "MediaDataRepresentation.c"
 }
 
 
@@ -6864,22 +6879,22 @@ static void media_source_collection_instance_init (MediaSourceCollection * self)
 #line 345 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->offline_bin = NULL;
 #line 346 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_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 346 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->by_master_file = _tmp0_;
 #line 348 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp1_ = gee_tree_multi_map_new (TYPE_IMPORT_ID, (GBoxedCopyFunc) import_id_dup, import_id_free, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _import_id_compare_func_gcompare_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp1_ = gee_tree_multi_map_new (TYPE_IMPORT_ID, (GBoxedCopyFunc) import_id_dup, (GDestroyNotify) import_id_free, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _import_id_compare_func_gcompare_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 348 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->import_rolls = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
 #line 350 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp2_ = gee_tree_set_new (TYPE_IMPORT_ID, (GBoxedCopyFunc) import_id_dup, import_id_free, _import_id_compare_func_gcompare_data_func, NULL, NULL);
+	_tmp2_ = gee_tree_set_new (TYPE_IMPORT_ID, (GBoxedCopyFunc) import_id_dup, (GDestroyNotify) import_id_free, _import_id_compare_func_gcompare_data_func, NULL, NULL);
 #line 350 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->sorted_import_ids = _tmp2_;
 #line 351 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp3_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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 6881 "MediaDataRepresentation.c"
+#line 6896 "MediaDataRepresentation.c"
 }
 
 
@@ -6901,7 +6916,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 6903 "MediaDataRepresentation.c"
+#line 6918 "MediaDataRepresentation.c"
 }
 
 
@@ -6920,7 +6935,7 @@ 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"
 	media_collection_registry_on_init_done ((MediaCollectionRegistry*) self);
-#line 6922 "MediaDataRepresentation.c"
+#line 6937 "MediaDataRepresentation.c"
 }
 
 
@@ -6940,14 +6955,14 @@ static MediaCollectionRegistry* media_collection_registry_construct (GType objec
 	_application_unref0 (_tmp1_);
 #line 749 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self;
-#line 6942 "MediaDataRepresentation.c"
+#line 6957 "MediaDataRepresentation.c"
 }
 
 
 static MediaCollectionRegistry* media_collection_registry_new (void) {
 #line 749 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return media_collection_registry_construct (TYPE_MEDIA_COLLECTION_REGISTRY);
-#line 6949 "MediaDataRepresentation.c"
+#line 6964 "MediaDataRepresentation.c"
 }
 
 
@@ -6986,14 +7001,14 @@ static void media_collection_registry_on_init_done (MediaCollectionRegistry* sel
 	_library_monitor_pool_unref0 (_tmp6_);
 #line 757 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (library_monitor);
-#line 6988 "MediaDataRepresentation.c"
+#line 7003 "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"
 	media_collection_registry_on_import_directory_changed ();
-#line 6995 "MediaDataRepresentation.c"
+#line 7010 "MediaDataRepresentation.c"
 }
 
 
@@ -7015,7 +7030,7 @@ void media_collection_registry_init (void) {
 	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"
 	_g_object_unref0 (_tmp2_);
-#line 7017 "MediaDataRepresentation.c"
+#line 7032 "MediaDataRepresentation.c"
 }
 
 
@@ -7033,7 +7048,7 @@ void media_collection_registry_terminate (void) {
 	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"
 	_g_object_unref0 (_tmp1_);
-#line 7035 "MediaDataRepresentation.c"
+#line 7050 "MediaDataRepresentation.c"
 }
 
 
@@ -7074,7 +7089,7 @@ static void media_collection_registry_on_import_directory_changed (void) {
 	_tmp6_ = current;
 #line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp6_ != NULL) {
-#line 7076 "MediaDataRepresentation.c"
+#line 7091 "MediaDataRepresentation.c"
 		LibraryMonitor* _tmp7_ = NULL;
 		GFile* _tmp8_ = NULL;
 		GFile* _tmp9_ = NULL;
@@ -7094,11 +7109,11 @@ static void media_collection_registry_on_import_directory_changed (void) {
 		_tmp5_ = _tmp11_;
 #line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp9_);
-#line 7096 "MediaDataRepresentation.c"
+#line 7111 "MediaDataRepresentation.c"
 	} else {
 #line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp5_ = FALSE;
-#line 7100 "MediaDataRepresentation.c"
+#line 7115 "MediaDataRepresentation.c"
 	}
 #line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp5_) {
@@ -7108,7 +7123,7 @@ static void media_collection_registry_on_import_directory_changed (void) {
 		_g_object_unref0 (import_dir);
 #line 779 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return;
-#line 7110 "MediaDataRepresentation.c"
+#line 7125 "MediaDataRepresentation.c"
 	}
 #line 781 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp12_ = import_dir;
@@ -7134,14 +7149,14 @@ static void media_collection_registry_on_import_directory_changed (void) {
 	_g_object_unref0 (current);
 #line 774 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (import_dir);
-#line 7136 "MediaDataRepresentation.c"
+#line 7151 "MediaDataRepresentation.c"
 }
 
 
 static gpointer _media_collection_registry_ref0 (gpointer self) {
 #line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self ? media_collection_registry_ref (self) : NULL;
-#line 7143 "MediaDataRepresentation.c"
+#line 7158 "MediaDataRepresentation.c"
 }
 
 
@@ -7157,7 +7172,7 @@ MediaCollectionRegistry* media_collection_registry_get_instance (void) {
 	result = _tmp1_;
 #line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 7159 "MediaDataRepresentation.c"
+#line 7174 "MediaDataRepresentation.c"
 }
 
 
@@ -7173,7 +7188,7 @@ gchar* media_collection_registry_get_typename_from_source_id (const gchar* sourc
 	_tmp1_ = g_str_has_prefix (_tmp0_, PHOTO_TYPENAME);
 #line 793 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp1_) {
-#line 7175 "MediaDataRepresentation.c"
+#line 7190 "MediaDataRepresentation.c"
 		gchar* _tmp2_ = NULL;
 #line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = g_strdup (PHOTO_TYPENAME);
@@ -7181,7 +7196,7 @@ gchar* media_collection_registry_get_typename_from_source_id (const gchar* sourc
 		result = _tmp2_;
 #line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 7183 "MediaDataRepresentation.c"
+#line 7198 "MediaDataRepresentation.c"
 	} else {
 		gchar** components = NULL;
 		const gchar* _tmp3_ = NULL;
@@ -7225,7 +7240,7 @@ gchar* media_collection_registry_get_typename_from_source_id (const gchar* sourc
 		components = (_vala_array_free (components, components_length1, (GDestroyNotify) g_free), NULL);
 #line 799 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 7227 "MediaDataRepresentation.c"
+#line 7242 "MediaDataRepresentation.c"
 	}
 }
 
@@ -7262,7 +7277,7 @@ void media_collection_registry_register_collection (MediaCollectionRegistry* sel
 	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"
 	_g_free0 (_tmp5_);
-#line 7264 "MediaDataRepresentation.c"
+#line 7279 "MediaDataRepresentation.c"
 }
 
 
@@ -7285,7 +7300,7 @@ MediaSourceCollection* media_collection_registry_get_collection (MediaCollection
 	result = (MediaSourceCollection*) _tmp2_;
 #line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 7287 "MediaDataRepresentation.c"
+#line 7302 "MediaDataRepresentation.c"
 }
 
 
@@ -7306,14 +7321,14 @@ GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self)
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 817 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 7308 "MediaDataRepresentation.c"
+#line 7323 "MediaDataRepresentation.c"
 }
 
 
 void media_collection_registry_freeze_all (MediaCollectionRegistry* self) {
 #line 820 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self));
-#line 7315 "MediaDataRepresentation.c"
+#line 7330 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
@@ -7334,7 +7349,7 @@ void media_collection_registry_freeze_all (MediaCollectionRegistry* self) {
 		_sources_it = _tmp3_;
 #line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 7336 "MediaDataRepresentation.c"
+#line 7351 "MediaDataRepresentation.c"
 			GeeIterator* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
 			MediaSourceCollection* sources = NULL;
@@ -7349,7 +7364,7 @@ void media_collection_registry_freeze_all (MediaCollectionRegistry* self) {
 			if (!_tmp5_) {
 #line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 7351 "MediaDataRepresentation.c"
+#line 7366 "MediaDataRepresentation.c"
 			}
 #line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _sources_it;
@@ -7363,11 +7378,11 @@ void media_collection_registry_freeze_all (MediaCollectionRegistry* self) {
 			data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection));
 #line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_data_collection_unref0 (sources);
-#line 7365 "MediaDataRepresentation.c"
+#line 7380 "MediaDataRepresentation.c"
 		}
 #line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_sources_it);
-#line 7369 "MediaDataRepresentation.c"
+#line 7384 "MediaDataRepresentation.c"
 	}
 }
 
@@ -7375,7 +7390,7 @@ void media_collection_registry_freeze_all (MediaCollectionRegistry* self) {
 void media_collection_registry_thaw_all (MediaCollectionRegistry* self) {
 #line 825 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self));
-#line 7377 "MediaDataRepresentation.c"
+#line 7392 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
@@ -7396,7 +7411,7 @@ void media_collection_registry_thaw_all (MediaCollectionRegistry* self) {
 		_sources_it = _tmp3_;
 #line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 7398 "MediaDataRepresentation.c"
+#line 7413 "MediaDataRepresentation.c"
 			GeeIterator* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
 			MediaSourceCollection* sources = NULL;
@@ -7411,7 +7426,7 @@ void media_collection_registry_thaw_all (MediaCollectionRegistry* self) {
 			if (!_tmp5_) {
 #line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 7413 "MediaDataRepresentation.c"
+#line 7428 "MediaDataRepresentation.c"
 			}
 #line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _sources_it;
@@ -7425,11 +7440,11 @@ void media_collection_registry_thaw_all (MediaCollectionRegistry* self) {
 			data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection));
 #line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_data_collection_unref0 (sources);
-#line 7427 "MediaDataRepresentation.c"
+#line 7442 "MediaDataRepresentation.c"
 		}
 #line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_sources_it);
-#line 7431 "MediaDataRepresentation.c"
+#line 7446 "MediaDataRepresentation.c"
 	}
 }
 
@@ -7437,7 +7452,7 @@ void media_collection_registry_thaw_all (MediaCollectionRegistry* self) {
 void media_collection_registry_begin_transaction_on_all (MediaCollectionRegistry* self) {
 #line 830 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self));
-#line 7439 "MediaDataRepresentation.c"
+#line 7454 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
@@ -7458,7 +7473,7 @@ void media_collection_registry_begin_transaction_on_all (MediaCollectionRegistry
 		_sources_it = _tmp3_;
 #line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 7460 "MediaDataRepresentation.c"
+#line 7475 "MediaDataRepresentation.c"
 			GeeIterator* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
 			MediaSourceCollection* sources = NULL;
@@ -7475,7 +7490,7 @@ void media_collection_registry_begin_transaction_on_all (MediaCollectionRegistry
 			if (!_tmp5_) {
 #line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 7477 "MediaDataRepresentation.c"
+#line 7492 "MediaDataRepresentation.c"
 			}
 #line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _sources_it;
@@ -7493,11 +7508,11 @@ void media_collection_registry_begin_transaction_on_all (MediaCollectionRegistry
 			transaction_controller_begin (_tmp10_);
 #line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_data_collection_unref0 (sources);
-#line 7495 "MediaDataRepresentation.c"
+#line 7510 "MediaDataRepresentation.c"
 		}
 #line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_sources_it);
-#line 7499 "MediaDataRepresentation.c"
+#line 7514 "MediaDataRepresentation.c"
 	}
 }
 
@@ -7505,7 +7520,7 @@ void media_collection_registry_begin_transaction_on_all (MediaCollectionRegistry
 void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistry* self) {
 #line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self));
-#line 7507 "MediaDataRepresentation.c"
+#line 7522 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
@@ -7526,7 +7541,7 @@ void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistr
 		_sources_it = _tmp3_;
 #line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 7528 "MediaDataRepresentation.c"
+#line 7543 "MediaDataRepresentation.c"
 			GeeIterator* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
 			MediaSourceCollection* sources = NULL;
@@ -7543,7 +7558,7 @@ void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistr
 			if (!_tmp5_) {
 #line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 7545 "MediaDataRepresentation.c"
+#line 7560 "MediaDataRepresentation.c"
 			}
 #line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _sources_it;
@@ -7561,11 +7576,11 @@ void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistr
 			transaction_controller_commit (_tmp10_);
 #line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_data_collection_unref0 (sources);
-#line 7563 "MediaDataRepresentation.c"
+#line 7578 "MediaDataRepresentation.c"
 		}
 #line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_sources_it);
-#line 7567 "MediaDataRepresentation.c"
+#line 7582 "MediaDataRepresentation.c"
 	}
 }
 
@@ -7602,7 +7617,7 @@ MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* sel
 	_tmp4_ = collection;
 #line 844 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp4_ == NULL) {
-#line 7604 "MediaDataRepresentation.c"
+#line 7619 "MediaDataRepresentation.c"
 		const gchar* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
 #line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -7620,7 +7635,7 @@ MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* sel
 		_g_free0 (typename);
 #line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 7621 "MediaDataRepresentation.c"
+#line 7636 "MediaDataRepresentation.c"
 	}
 #line 849 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp7_ = collection;
@@ -7636,14 +7651,14 @@ MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* sel
 	_g_free0 (typename);
 #line 849 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 7637 "MediaDataRepresentation.c"
+#line 7652 "MediaDataRepresentation.c"
 }
 
 
 static gpointer _import_id_dup0 (gpointer self) {
 #line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self ? import_id_dup (self) : NULL;
-#line 7644 "MediaDataRepresentation.c"
+#line 7659 "MediaDataRepresentation.c"
 }
 
 
@@ -7656,7 +7671,7 @@ ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry*
 	g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL);
 #line 853 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	import_id_init (&last_import_id, IMPORT_ID_INVALID);
-#line 7657 "MediaDataRepresentation.c"
+#line 7672 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _current_collection_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
@@ -7677,7 +7692,7 @@ ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry*
 		_current_collection_it = _tmp3_;
 #line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 7678 "MediaDataRepresentation.c"
+#line 7693 "MediaDataRepresentation.c"
 			GeeIterator* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
 			MediaSourceCollection* current_collection = NULL;
@@ -7699,7 +7714,7 @@ ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry*
 			if (!_tmp5_) {
 #line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 7700 "MediaDataRepresentation.c"
+#line 7715 "MediaDataRepresentation.c"
 			}
 #line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _current_collection_it;
@@ -7723,7 +7738,7 @@ ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry*
 				_data_collection_unref0 (current_collection);
 #line 859 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				continue;
-#line 7724 "MediaDataRepresentation.c"
+#line 7739 "MediaDataRepresentation.c"
 			}
 #line 861 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp11_ = current_import_id;
@@ -7735,23 +7750,23 @@ ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry*
 			_tmp14_ = _tmp13_.id;
 #line 861 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp12_ > _tmp14_) {
-#line 7736 "MediaDataRepresentation.c"
+#line 7751 "MediaDataRepresentation.c"
 				ImportID* _tmp15_ = NULL;
 #line 862 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp15_ = current_import_id;
 #line 862 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				last_import_id = *_tmp15_;
-#line 7742 "MediaDataRepresentation.c"
+#line 7757 "MediaDataRepresentation.c"
 			}
 #line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_import_id_free0 (current_import_id);
 #line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_data_collection_unref0 (current_collection);
-#line 7748 "MediaDataRepresentation.c"
+#line 7763 "MediaDataRepresentation.c"
 		}
 #line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_current_collection_it);
-#line 7752 "MediaDataRepresentation.c"
+#line 7767 "MediaDataRepresentation.c"
 	}
 #line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp16_ = last_import_id;
@@ -7763,7 +7778,7 @@ ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry*
 		result = NULL;
 #line 868 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 7764 "MediaDataRepresentation.c"
+#line 7779 "MediaDataRepresentation.c"
 	} else {
 		ImportID* _tmp18_ = NULL;
 #line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -7772,7 +7787,7 @@ ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry*
 		result = _tmp18_;
 #line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 7773 "MediaDataRepresentation.c"
+#line 7788 "MediaDataRepresentation.c"
 	}
 }
 
@@ -7786,10 +7801,10 @@ GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaColle
 #line 873 "/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"
-	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+	_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"
 	_result_ = _tmp0_;
-#line 7790 "MediaDataRepresentation.c"
+#line 7805 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _current_collection_it = NULL;
 		GeeCollection* _tmp1_ = NULL;
@@ -7810,7 +7825,7 @@ GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaColle
 		_current_collection_it = _tmp4_;
 #line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 7811 "MediaDataRepresentation.c"
+#line 7826 "MediaDataRepresentation.c"
 			GeeIterator* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
 			MediaSourceCollection* current_collection = NULL;
@@ -7829,7 +7844,7 @@ GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaColle
 			if (!_tmp6_) {
 #line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 7830 "MediaDataRepresentation.c"
+#line 7845 "MediaDataRepresentation.c"
 			}
 #line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = _current_collection_it;
@@ -7853,17 +7868,17 @@ GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaColle
 			_g_object_unref0 (_tmp13_);
 #line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_data_collection_unref0 (current_collection);
-#line 7854 "MediaDataRepresentation.c"
+#line 7869 "MediaDataRepresentation.c"
 		}
 #line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_current_collection_it);
-#line 7858 "MediaDataRepresentation.c"
+#line 7873 "MediaDataRepresentation.c"
 	}
 #line 880 "/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"
 	return result;
-#line 7864 "MediaDataRepresentation.c"
+#line 7879 "MediaDataRepresentation.c"
 }
 
 
@@ -7873,7 +7888,7 @@ MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaC
 	g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL);
 #line 883 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 7874 "MediaDataRepresentation.c"
+#line 7889 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _collection_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
@@ -7894,7 +7909,7 @@ MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaC
 		_collection_it = _tmp3_;
 #line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 7895 "MediaDataRepresentation.c"
+#line 7910 "MediaDataRepresentation.c"
 			GeeIterator* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
 			MediaSourceCollection* collection = NULL;
@@ -7911,7 +7926,7 @@ MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaC
 			if (!_tmp5_) {
 #line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 7912 "MediaDataRepresentation.c"
+#line 7927 "MediaDataRepresentation.c"
 			}
 #line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _collection_it;
@@ -7933,21 +7948,21 @@ MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaC
 				_g_object_unref0 (_collection_it);
 #line 886 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				return result;
-#line 7934 "MediaDataRepresentation.c"
+#line 7949 "MediaDataRepresentation.c"
 			}
 #line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_data_collection_unref0 (collection);
-#line 7938 "MediaDataRepresentation.c"
+#line 7953 "MediaDataRepresentation.c"
 		}
 #line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_collection_it);
-#line 7942 "MediaDataRepresentation.c"
+#line 7957 "MediaDataRepresentation.c"
 	}
 #line 889 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = NULL;
 #line 889 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 7948 "MediaDataRepresentation.c"
+#line 7963 "MediaDataRepresentation.c"
 }
 
 
@@ -7970,7 +7985,7 @@ gboolean media_collection_registry_is_valid_source_id (MediaCollectionRegistry*
 		result = FALSE;
 #line 894 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 7971 "MediaDataRepresentation.c"
+#line 7986 "MediaDataRepresentation.c"
 	}
 #line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = source_id;
@@ -7980,7 +7995,7 @@ gboolean media_collection_registry_is_valid_source_id (MediaCollectionRegistry*
 	if (_tmp4_) {
 #line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = TRUE;
-#line 7981 "MediaDataRepresentation.c"
+#line 7996 "MediaDataRepresentation.c"
 	} else {
 		const gchar* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
@@ -7990,20 +8005,20 @@ gboolean media_collection_registry_is_valid_source_id (MediaCollectionRegistry*
 		_tmp6_ = g_str_has_prefix (_tmp5_, VIDEO_TYPENAME "-");
 #line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = _tmp6_;
-#line 7991 "MediaDataRepresentation.c"
+#line 8006 "MediaDataRepresentation.c"
 	}
 #line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp2_;
 #line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 7997 "MediaDataRepresentation.c"
+#line 8012 "MediaDataRepresentation.c"
 }
 
 
 static void value_media_collection_registry_init (GValue* value) {
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	value->data[0].v_pointer = NULL;
-#line 8004 "MediaDataRepresentation.c"
+#line 8019 "MediaDataRepresentation.c"
 }
 
 
@@ -8012,7 +8027,7 @@ static void value_media_collection_registry_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_collection_registry_unref (value->data[0].v_pointer);
-#line 8013 "MediaDataRepresentation.c"
+#line 8028 "MediaDataRepresentation.c"
 	}
 }
 
@@ -8022,11 +8037,11 @@ static void value_media_collection_registry_copy_value (const GValue* src_value,
 	if (src_value->data[0].v_pointer) {
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		dest_value->data[0].v_pointer = media_collection_registry_ref (src_value->data[0].v_pointer);
-#line 8023 "MediaDataRepresentation.c"
+#line 8038 "MediaDataRepresentation.c"
 	} else {
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8027 "MediaDataRepresentation.c"
+#line 8042 "MediaDataRepresentation.c"
 	}
 }
 
@@ -8034,37 +8049,37 @@ static void value_media_collection_registry_copy_value (const GValue* src_value,
 static gpointer value_media_collection_registry_peek_pointer (const GValue* value) {
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return value->data[0].v_pointer;
-#line 8035 "MediaDataRepresentation.c"
+#line 8050 "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"
 	if (collect_values[0].v_pointer) {
-#line 8042 "MediaDataRepresentation.c"
+#line 8057 "MediaDataRepresentation.c"
 		MediaCollectionRegistry* object;
 		object = collect_values[0].v_pointer;
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8049 "MediaDataRepresentation.c"
+#line 8064 "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"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8053 "MediaDataRepresentation.c"
+#line 8068 "MediaDataRepresentation.c"
 		}
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = media_collection_registry_ref (object);
-#line 8057 "MediaDataRepresentation.c"
+#line 8072 "MediaDataRepresentation.c"
 	} else {
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = NULL;
-#line 8061 "MediaDataRepresentation.c"
+#line 8076 "MediaDataRepresentation.c"
 	}
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 8065 "MediaDataRepresentation.c"
+#line 8080 "MediaDataRepresentation.c"
 }
 
 
@@ -8075,25 +8090,25 @@ static gchar* value_media_collection_registry_lcopy_value (const GValue* value,
 	if (!object_p) {
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8076 "MediaDataRepresentation.c"
+#line 8091 "MediaDataRepresentation.c"
 	}
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (!value->data[0].v_pointer) {
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		*object_p = NULL;
-#line 8082 "MediaDataRepresentation.c"
+#line 8097 "MediaDataRepresentation.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8086 "MediaDataRepresentation.c"
+#line 8101 "MediaDataRepresentation.c"
 	} else {
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		*object_p = media_collection_registry_ref (value->data[0].v_pointer);
-#line 8090 "MediaDataRepresentation.c"
+#line 8105 "MediaDataRepresentation.c"
 	}
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 8094 "MediaDataRepresentation.c"
+#line 8109 "MediaDataRepresentation.c"
 }
 
 
@@ -8107,7 +8122,7 @@ GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return G_PARAM_SPEC (spec);
-#line 8108 "MediaDataRepresentation.c"
+#line 8123 "MediaDataRepresentation.c"
 }
 
 
@@ -8116,7 +8131,7 @@ gpointer value_get_media_collection_registry (const GValue* value) {
 	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"
 	return value->data[0].v_pointer;
-#line 8117 "MediaDataRepresentation.c"
+#line 8132 "MediaDataRepresentation.c"
 }
 
 
@@ -8136,17 +8151,17 @@ void value_set_media_collection_registry (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_collection_registry_ref (value->data[0].v_pointer);
-#line 8137 "MediaDataRepresentation.c"
+#line 8152 "MediaDataRepresentation.c"
 	} else {
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = NULL;
-#line 8141 "MediaDataRepresentation.c"
+#line 8156 "MediaDataRepresentation.c"
 	}
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (old) {
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_collection_registry_unref (old);
-#line 8147 "MediaDataRepresentation.c"
+#line 8162 "MediaDataRepresentation.c"
 	}
 }
 
@@ -8165,17 +8180,17 @@ void value_take_media_collection_registry (GValue* value, gpointer v_object) {
 		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"
 		value->data[0].v_pointer = v_object;
-#line 8166 "MediaDataRepresentation.c"
+#line 8181 "MediaDataRepresentation.c"
 	} else {
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = NULL;
-#line 8170 "MediaDataRepresentation.c"
+#line 8185 "MediaDataRepresentation.c"
 	}
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (old) {
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_collection_registry_unref (old);
-#line 8176 "MediaDataRepresentation.c"
+#line 8191 "MediaDataRepresentation.c"
 	}
 }
 
@@ -8187,7 +8202,7 @@ static void media_collection_registry_class_init (MediaCollectionRegistryClass *
 	((MediaCollectionRegistryClass *) klass)->finalize = media_collection_registry_finalize;
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_type_class_add_private (klass, sizeof (MediaCollectionRegistryPrivate));
-#line 8188 "MediaDataRepresentation.c"
+#line 8203 "MediaDataRepresentation.c"
 }
 
 
@@ -8197,16 +8212,16 @@ static void media_collection_registry_instance_init (MediaCollectionRegistry * s
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv = MEDIA_COLLECTION_REGISTRY_GET_PRIVATE (self);
 #line 745 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, data_collection_unref, NULL, NULL, NULL);
+	_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"
 	self->priv->all = _tmp0_;
 #line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_MEDIA_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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"
 	self->priv->by_typename = _tmp1_;
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->ref_count = 1;
-#line 8207 "MediaDataRepresentation.c"
+#line 8222 "MediaDataRepresentation.c"
 }
 
 
@@ -8233,7 +8248,7 @@ static void media_collection_registry_finalize (MediaCollectionRegistry* obj) {
 	_g_object_unref0 (self->priv->all);
 #line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (self->priv->by_typename);
-#line 8234 "MediaDataRepresentation.c"
+#line 8249 "MediaDataRepresentation.c"
 }
 
 
@@ -8258,7 +8273,7 @@ gpointer media_collection_registry_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return instance;
-#line 8259 "MediaDataRepresentation.c"
+#line 8274 "MediaDataRepresentation.c"
 }
 
 
@@ -8271,7 +8286,7 @@ void media_collection_registry_unref (gpointer instance) {
 		MEDIA_COLLECTION_REGISTRY_GET_CLASS (self)->finalize (self);
 #line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8272 "MediaDataRepresentation.c"
+#line 8287 "MediaDataRepresentation.c"
 	}
 }
 
diff --git a/src/MediaInterfaces.c b/src/MediaInterfaces.c
index a755c56..9e100e1 100644
--- a/src/MediaInterfaces.c
+++ b/src/MediaInterfaces.c
@@ -1,4 +1,4 @@
-/* MediaInterfaces.c generated by valac 0.34.4, the Vala compiler
+/* MediaInterfaces.c generated by valac 0.34.7, the Vala compiler
  * generated from MediaInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 = transaction_controller_real_commit_impl;
+	((TransactionControllerClass *) klass)->commit_impl = (void (*)(TransactionController*, GError**)) transaction_controller_real_commit_impl;
 #line 756 "MediaInterfaces.c"
 }
 
diff --git a/src/MediaMetadata.c b/src/MediaMetadata.c
index ddecf33..b2e19cf 100644
--- a/src/MediaMetadata.c
+++ b/src/MediaMetadata.c
@@ -1,4 +1,4 @@
-/* MediaMetadata.c generated by valac 0.34.4, the Vala compiler
+/* MediaMetadata.c generated by valac 0.34.7, the Vala compiler
  * generated from MediaMetadata.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 = 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 = 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 = media_metadata_real_get_comment;
+	((MediaMetadataClass *) klass)->get_comment = (gchar* (*)(MediaMetadata*)) media_metadata_real_get_comment;
 #line 433 "MediaMetadata.c"
 }
 
diff --git a/src/MediaMonitor.c b/src/MediaMonitor.c
index f723c0f..6bf6a2d 100644
--- a/src/MediaMonitor.c
+++ b/src/MediaMonitor.c
@@ -1,4 +1,4 @@
-/* MediaMonitor.c generated by valac 0.34.4, the Vala compiler
+/* MediaMonitor.c generated by valac 0.34.7, the Vala compiler
  * generated from MediaMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = monitorable_updates_real_is_all_updated;
+	((MonitorableUpdatesClass *) klass)->is_all_updated = (gboolean (*)(MonitorableUpdates*)) monitorable_updates_real_is_all_updated;
 #line 1054 "MediaMonitor.c"
 }
 
@@ -1457,11 +1457,12 @@ void media_monitor_notify_discovery_completing (MediaMonitor* self) {
 
 
 static gboolean media_monitor_real_is_file_represented (MediaMonitor* self, GFile* file) {
+	gboolean _tmp0_ = FALSE;
 #line 189 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_monitor_is_file_represented'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 189 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	return FALSE;
-#line 1465 "MediaMonitor.c"
+	return _tmp0_;
+#line 1466 "MediaMonitor.c"
 }
 
 
@@ -1470,16 +1471,17 @@ gboolean media_monitor_is_file_represented (MediaMonitor* self, GFile* file) {
 	g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE);
 #line 189 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	return MEDIA_MONITOR_GET_CLASS (self)->is_file_represented (self, file);
-#line 1474 "MediaMonitor.c"
+#line 1475 "MediaMonitor.c"
 }
 
 
 static gboolean media_monitor_real_notify_file_created (MediaMonitor* self, GFile* file, GFileInfo* info) {
+	gboolean _tmp0_ = FALSE;
 #line 191 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_created'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 191 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	return FALSE;
-#line 1483 "MediaMonitor.c"
+	return _tmp0_;
+#line 1485 "MediaMonitor.c"
 }
 
 
@@ -1488,16 +1490,17 @@ gboolean media_monitor_notify_file_created (MediaMonitor* self, GFile* file, GFi
 	g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE);
 #line 191 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	return MEDIA_MONITOR_GET_CLASS (self)->notify_file_created (self, file, info);
-#line 1492 "MediaMonitor.c"
+#line 1494 "MediaMonitor.c"
 }
 
 
 static gboolean media_monitor_real_notify_file_moved (MediaMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info) {
+	gboolean _tmp0_ = FALSE;
 #line 193 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_moved'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 193 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	return FALSE;
-#line 1501 "MediaMonitor.c"
+	return _tmp0_;
+#line 1504 "MediaMonitor.c"
 }
 
 
@@ -1506,16 +1509,17 @@ gboolean media_monitor_notify_file_moved (MediaMonitor* self, GFile* old_file, G
 	g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE);
 #line 193 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	return MEDIA_MONITOR_GET_CLASS (self)->notify_file_moved (self, old_file, new_file, new_file_info);
-#line 1510 "MediaMonitor.c"
+#line 1513 "MediaMonitor.c"
 }
 
 
 static gboolean media_monitor_real_notify_file_altered (MediaMonitor* self, GFile* file) {
+	gboolean _tmp0_ = FALSE;
 #line 195 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_altered'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 195 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	return FALSE;
-#line 1519 "MediaMonitor.c"
+	return _tmp0_;
+#line 1523 "MediaMonitor.c"
 }
 
 
@@ -1524,16 +1528,17 @@ gboolean media_monitor_notify_file_altered (MediaMonitor* self, GFile* file) {
 	g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE);
 #line 195 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	return MEDIA_MONITOR_GET_CLASS (self)->notify_file_altered (self, file);
-#line 1528 "MediaMonitor.c"
+#line 1532 "MediaMonitor.c"
 }
 
 
 static gboolean media_monitor_real_notify_file_attributes_altered (MediaMonitor* self, GFile* file) {
+	gboolean _tmp0_ = FALSE;
 #line 197 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_attributes_altered'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 197 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	return FALSE;
-#line 1537 "MediaMonitor.c"
+	return _tmp0_;
+#line 1542 "MediaMonitor.c"
 }
 
 
@@ -1542,16 +1547,17 @@ gboolean media_monitor_notify_file_attributes_altered (MediaMonitor* self, GFile
 	g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE);
 #line 197 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	return MEDIA_MONITOR_GET_CLASS (self)->notify_file_attributes_altered (self, file);
-#line 1546 "MediaMonitor.c"
+#line 1551 "MediaMonitor.c"
 }
 
 
 static gboolean media_monitor_real_notify_file_alteration_completed (MediaMonitor* self, GFile* file, GFileInfo* info) {
+	gboolean _tmp0_ = FALSE;
 #line 199 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_alteration_completed'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 199 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	return FALSE;
-#line 1555 "MediaMonitor.c"
+	return _tmp0_;
+#line 1561 "MediaMonitor.c"
 }
 
 
@@ -1560,16 +1566,17 @@ gboolean media_monitor_notify_file_alteration_completed (MediaMonitor* self, GFi
 	g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE);
 #line 199 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	return MEDIA_MONITOR_GET_CLASS (self)->notify_file_alteration_completed (self, file, info);
-#line 1564 "MediaMonitor.c"
+#line 1570 "MediaMonitor.c"
 }
 
 
 static gboolean media_monitor_real_notify_file_deleted (MediaMonitor* self, GFile* file) {
+	gboolean _tmp0_ = FALSE;
 #line 201 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_deleted'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 201 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	return FALSE;
-#line 1573 "MediaMonitor.c"
+	return _tmp0_;
+#line 1580 "MediaMonitor.c"
 }
 
 
@@ -1578,14 +1585,14 @@ gboolean media_monitor_notify_file_deleted (MediaMonitor* self, GFile* file) {
 	g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE);
 #line 201 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	return MEDIA_MONITOR_GET_CLASS (self)->notify_file_deleted (self, file);
-#line 1582 "MediaMonitor.c"
+#line 1589 "MediaMonitor.c"
 }
 
 
 void media_monitor_mdbg (const gchar* msg) {
 #line 203 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_if_fail (msg != NULL);
-#line 1589 "MediaMonitor.c"
+#line 1596 "MediaMonitor.c"
 }
 
 
@@ -1599,14 +1606,14 @@ gboolean media_monitor_has_pending_updates (MediaMonitor* self) {
 #line 210 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_tmp0_ = self->priv->pending_updates;
 #line 210 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	_tmp1_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+	_tmp1_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 210 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_tmp2_ = _tmp1_;
 #line 210 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	result = _tmp2_ > 0;
 #line 210 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	return result;
-#line 1610 "MediaMonitor.c"
+#line 1617 "MediaMonitor.c"
 }
 
 
@@ -1620,14 +1627,14 @@ GeeCollection* media_monitor_get_monitorables (MediaMonitor* self) {
 #line 214 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_tmp0_ = self->priv->pending_updates;
 #line 214 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+	_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 214 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_tmp2_ = _tmp1_;
 #line 214 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 214 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	return result;
-#line 1631 "MediaMonitor.c"
+#line 1638 "MediaMonitor.c"
 }
 
 
@@ -1663,7 +1670,7 @@ MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, Monitorable
 		result = updates;
 #line 222 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		return result;
-#line 1667 "MediaMonitor.c"
+#line 1674 "MediaMonitor.c"
 	}
 #line 224 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_tmp4_ = monitorable;
@@ -1685,7 +1692,7 @@ MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, Monitorable
 	result = updates;
 #line 227 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	return result;
-#line 1689 "MediaMonitor.c"
+#line 1696 "MediaMonitor.c"
 }
 
 
@@ -1708,7 +1715,7 @@ MonitorableUpdates* media_monitor_get_existing_updates (MediaMonitor* self, Moni
 	result = (MonitorableUpdates*) _tmp2_;
 #line 231 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	return result;
-#line 1712 "MediaMonitor.c"
+#line 1719 "MediaMonitor.c"
 }
 
 
@@ -1725,7 +1732,7 @@ void media_monitor_remove_updates (MediaMonitor* self, Monitorable* monitorable)
 	_tmp1_ = monitorable;
 #line 235 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL);
-#line 1729 "MediaMonitor.c"
+#line 1736 "MediaMonitor.c"
 }
 
 
@@ -1750,7 +1757,7 @@ gboolean media_monitor_is_online (MediaMonitor* self, Monitorable* monitorable)
 	_tmp3_ = updates;
 #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (_tmp3_ != NULL) {
-#line 1754 "MediaMonitor.c"
+#line 1761 "MediaMonitor.c"
 		MonitorableUpdates* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1759,7 +1766,7 @@ gboolean media_monitor_is_online (MediaMonitor* self, Monitorable* monitorable)
 		_tmp5_ = monitorable_updates_is_set_online (_tmp4_);
 #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp2_ = _tmp5_;
-#line 1763 "MediaMonitor.c"
+#line 1770 "MediaMonitor.c"
 	} else {
 		Monitorable* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
@@ -1769,7 +1776,7 @@ gboolean media_monitor_is_online (MediaMonitor* self, Monitorable* monitorable)
 		_tmp7_ = monitorable_is_offline (_tmp6_);
 #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp2_ = !_tmp7_;
-#line 1773 "MediaMonitor.c"
+#line 1780 "MediaMonitor.c"
 	}
 #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	result = _tmp2_;
@@ -1777,7 +1784,7 @@ gboolean media_monitor_is_online (MediaMonitor* self, Monitorable* monitorable)
 	_monitorable_updates_unref0 (updates);
 #line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	return result;
-#line 1781 "MediaMonitor.c"
+#line 1788 "MediaMonitor.c"
 }
 
 
@@ -1802,7 +1809,7 @@ gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable)
 	_tmp3_ = updates;
 #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (_tmp3_ != NULL) {
-#line 1806 "MediaMonitor.c"
+#line 1813 "MediaMonitor.c"
 		MonitorableUpdates* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1811,7 +1818,7 @@ gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable)
 		_tmp5_ = monitorable_updates_is_set_offline (_tmp4_);
 #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp2_ = _tmp5_;
-#line 1815 "MediaMonitor.c"
+#line 1822 "MediaMonitor.c"
 	} else {
 		Monitorable* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
@@ -1821,7 +1828,7 @@ gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable)
 		_tmp7_ = monitorable_is_offline (_tmp6_);
 #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp2_ = _tmp7_;
-#line 1825 "MediaMonitor.c"
+#line 1832 "MediaMonitor.c"
 	}
 #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	result = _tmp2_;
@@ -1829,7 +1836,7 @@ gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable)
 	_monitorable_updates_unref0 (updates);
 #line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	return result;
-#line 1833 "MediaMonitor.c"
+#line 1840 "MediaMonitor.c"
 }
 
 
@@ -1855,7 +1862,7 @@ GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorab
 	_tmp4_ = updates;
 #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (_tmp4_ != NULL) {
-#line 1859 "MediaMonitor.c"
+#line 1866 "MediaMonitor.c"
 		MonitorableUpdates* _tmp5_ = NULL;
 		GFile* _tmp6_ = NULL;
 		GFile* _tmp7_ = NULL;
@@ -1869,15 +1876,15 @@ GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorab
 		_tmp3_ = _tmp7_ != NULL;
 #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_g_object_unref0 (_tmp7_);
-#line 1873 "MediaMonitor.c"
+#line 1880 "MediaMonitor.c"
 	} else {
 #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp3_ = FALSE;
-#line 1877 "MediaMonitor.c"
+#line 1884 "MediaMonitor.c"
 	}
 #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (_tmp3_) {
-#line 1881 "MediaMonitor.c"
+#line 1888 "MediaMonitor.c"
 		MonitorableUpdates* _tmp8_ = NULL;
 		GFile* _tmp9_ = NULL;
 #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1888,7 +1895,7 @@ GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorab
 		_g_object_unref0 (_tmp2_);
 #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp2_ = _tmp9_;
-#line 1892 "MediaMonitor.c"
+#line 1899 "MediaMonitor.c"
 	} else {
 		Monitorable* _tmp10_ = NULL;
 		GFile* _tmp11_ = NULL;
@@ -1900,7 +1907,7 @@ GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorab
 		_g_object_unref0 (_tmp2_);
 #line 254 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp2_ = _tmp11_;
-#line 1904 "MediaMonitor.c"
+#line 1911 "MediaMonitor.c"
 	}
 #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	result = _tmp2_;
@@ -1908,7 +1915,7 @@ GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorab
 	_monitorable_updates_unref0 (updates);
 #line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	return result;
-#line 1912 "MediaMonitor.c"
+#line 1919 "MediaMonitor.c"
 }
 
 
@@ -1935,7 +1942,7 @@ void media_monitor_update_master_file (MediaMonitor* self, Monitorable* monitora
 	monitorable_updates_set_master_file (_tmp2_, _tmp3_);
 #line 258 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_monitorable_updates_unref0 (_tmp2_);
-#line 1939 "MediaMonitor.c"
+#line 1946 "MediaMonitor.c"
 }
 
 
@@ -1957,7 +1964,7 @@ void media_monitor_update_master_file_info_altered (MediaMonitor* self, Monitora
 	monitorable_updates_set_master_file_info_altered (_tmp2_, TRUE);
 #line 262 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_monitorable_updates_unref0 (_tmp2_);
-#line 1961 "MediaMonitor.c"
+#line 1968 "MediaMonitor.c"
 }
 
 
@@ -1982,7 +1989,7 @@ void media_monitor_update_master_file_in_alteration (MediaMonitor* self, Monitor
 	monitorable_updates_set_master_in_alteration (_tmp2_, _tmp3_);
 #line 266 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_monitorable_updates_unref0 (_tmp2_);
-#line 1986 "MediaMonitor.c"
+#line 1993 "MediaMonitor.c"
 }
 
 
@@ -2009,7 +2016,7 @@ void media_monitor_update_master_file_alterations_completed (MediaMonitor* self,
 	monitorable_updates_set_master_alterations_complete (_tmp2_, _tmp3_);
 #line 270 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_monitorable_updates_unref0 (_tmp2_);
-#line 2013 "MediaMonitor.c"
+#line 2020 "MediaMonitor.c"
 }
 
 
@@ -2031,7 +2038,7 @@ void media_monitor_update_online (MediaMonitor* self, Monitorable* monitorable)
 	monitorable_updates_mark_online (_tmp2_);
 #line 274 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_monitorable_updates_unref0 (_tmp2_);
-#line 2035 "MediaMonitor.c"
+#line 2042 "MediaMonitor.c"
 }
 
 
@@ -2053,7 +2060,7 @@ void media_monitor_update_offline (MediaMonitor* self, Monitorable* monitorable)
 	monitorable_updates_mark_offline (_tmp2_);
 #line 278 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_monitorable_updates_unref0 (_tmp2_);
-#line 2057 "MediaMonitor.c"
+#line 2064 "MediaMonitor.c"
 }
 
 
@@ -2079,7 +2086,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 	to_offline = NULL;
 #line 290 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	to_online = NULL;
-#line 2083 "MediaMonitor.c"
+#line 2090 "MediaMonitor.c"
 	{
 		GeeIterator* _updates_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
@@ -2092,7 +2099,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 		_updates_it = _tmp1_;
 #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		while (TRUE) {
-#line 2096 "MediaMonitor.c"
+#line 2103 "MediaMonitor.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			MonitorableUpdates* updates = NULL;
@@ -2119,7 +2126,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 			if (!_tmp3_) {
 #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				break;
-#line 2123 "MediaMonitor.c"
+#line 2130 "MediaMonitor.c"
 			}
 #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp4_ = _updates_it;
@@ -2135,7 +2142,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 				_monitorable_updates_unref0 (updates);
 #line 294 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				break;
-#line 2139 "MediaMonitor.c"
+#line 2146 "MediaMonitor.c"
 			}
 #line 296 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp7_ = updates;
@@ -2149,7 +2156,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 			_g_object_unref0 (_tmp9_);
 #line 296 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			if (_tmp10_) {
-#line 2153 "MediaMonitor.c"
+#line 2160 "MediaMonitor.c"
 				GeeMap* _tmp11_ = NULL;
 				GeeMap* _tmp13_ = NULL;
 				MonitorableUpdates* _tmp14_ = NULL;
@@ -2163,15 +2170,15 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 				_tmp11_ = set_master_file;
 #line 297 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				if (_tmp11_ == NULL) {
-#line 2167 "MediaMonitor.c"
+#line 2174 "MediaMonitor.c"
 					GeeHashMap* _tmp12_ = NULL;
 #line 298 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-					_tmp12_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+					_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"
 					_g_object_unref0 (set_master_file);
 #line 298 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 					set_master_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_MAP, GeeMap);
-#line 2175 "MediaMonitor.c"
+#line 2182 "MediaMonitor.c"
 				}
 #line 300 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				_tmp13_ = set_master_file;
@@ -2197,7 +2204,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 				_tmp20_ = *op_count;
 #line 302 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				*op_count = _tmp20_ + 1;
-#line 2201 "MediaMonitor.c"
+#line 2208 "MediaMonitor.c"
 			}
 #line 305 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp21_ = updates;
@@ -2211,7 +2218,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 			_g_object_unref0 (_tmp23_);
 #line 305 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			if (_tmp24_) {
-#line 2215 "MediaMonitor.c"
+#line 2222 "MediaMonitor.c"
 				GeeMap* _tmp25_ = NULL;
 				GeeMap* _tmp27_ = NULL;
 				MonitorableUpdates* _tmp28_ = NULL;
@@ -2225,15 +2232,15 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 				_tmp25_ = set_master_file_info;
 #line 306 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				if (_tmp25_ == NULL) {
-#line 2229 "MediaMonitor.c"
+#line 2236 "MediaMonitor.c"
 					GeeHashMap* _tmp26_ = NULL;
 #line 307 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-					_tmp26_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+					_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"
 					_g_object_unref0 (set_master_file_info);
 #line 307 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 					set_master_file_info = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_MAP, GeeMap);
-#line 2237 "MediaMonitor.c"
+#line 2244 "MediaMonitor.c"
 				}
 #line 309 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				_tmp27_ = set_master_file_info;
@@ -2259,7 +2266,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 				_tmp34_ = *op_count;
 #line 311 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				*op_count = _tmp34_ + 1;
-#line 2263 "MediaMonitor.c"
+#line 2270 "MediaMonitor.c"
 			}
 #line 314 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp35_ = updates;
@@ -2267,7 +2274,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 			_tmp36_ = monitorable_updates_is_set_offline (_tmp35_);
 #line 314 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			if (_tmp36_) {
-#line 2271 "MediaMonitor.c"
+#line 2278 "MediaMonitor.c"
 				GeeArrayList* _tmp37_ = NULL;
 				GeeArrayList* _tmp39_ = NULL;
 				MonitorableUpdates* _tmp40_ = NULL;
@@ -2278,15 +2285,15 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 				_tmp37_ = to_offline;
 #line 315 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				if (_tmp37_ == NULL) {
-#line 2282 "MediaMonitor.c"
+#line 2289 "MediaMonitor.c"
 					GeeArrayList* _tmp38_ = NULL;
 #line 316 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-					_tmp38_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_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"
 					_g_object_unref0 (to_offline);
 #line 316 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 					to_offline = _tmp38_;
-#line 2290 "MediaMonitor.c"
+#line 2297 "MediaMonitor.c"
 				}
 #line 318 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				_tmp39_ = to_offline;
@@ -2304,7 +2311,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 				_tmp43_ = *op_count;
 #line 320 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				*op_count = _tmp43_ + 1;
-#line 2308 "MediaMonitor.c"
+#line 2315 "MediaMonitor.c"
 			}
 #line 323 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp44_ = updates;
@@ -2312,7 +2319,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 			_tmp45_ = monitorable_updates_is_set_online (_tmp44_);
 #line 323 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			if (_tmp45_) {
-#line 2316 "MediaMonitor.c"
+#line 2323 "MediaMonitor.c"
 				GeeArrayList* _tmp46_ = NULL;
 				GeeArrayList* _tmp48_ = NULL;
 				MonitorableUpdates* _tmp49_ = NULL;
@@ -2323,15 +2330,15 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 				_tmp46_ = to_online;
 #line 324 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				if (_tmp46_ == NULL) {
-#line 2327 "MediaMonitor.c"
+#line 2334 "MediaMonitor.c"
 					GeeArrayList* _tmp47_ = NULL;
 #line 325 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-					_tmp47_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_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"
 					_g_object_unref0 (to_online);
 #line 325 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 					to_online = _tmp47_;
-#line 2335 "MediaMonitor.c"
+#line 2342 "MediaMonitor.c"
 				}
 #line 327 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				_tmp48_ = to_online;
@@ -2349,21 +2356,21 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 				_tmp52_ = *op_count;
 #line 329 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				*op_count = _tmp52_ + 1;
-#line 2353 "MediaMonitor.c"
+#line 2360 "MediaMonitor.c"
 			}
 #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_monitorable_updates_unref0 (updates);
-#line 2357 "MediaMonitor.c"
+#line 2364 "MediaMonitor.c"
 		}
 #line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_g_object_unref0 (_updates_it);
-#line 2361 "MediaMonitor.c"
+#line 2368 "MediaMonitor.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_tmp53_ = set_master_file;
 #line 333 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (_tmp53_ != NULL) {
-#line 2367 "MediaMonitor.c"
+#line 2374 "MediaMonitor.c"
 		GeeMap* _tmp54_ = NULL;
 		gint _tmp55_ = 0;
 		gint _tmp56_ = 0;
@@ -2413,14 +2420,14 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 			_g_object_unref0 (set_master_file);
 #line 336 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			return;
-#line 2417 "MediaMonitor.c"
+#line 2424 "MediaMonitor.c"
 		}
 	}
 #line 339 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_tmp63_ = set_master_file_info;
 #line 339 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (_tmp63_ != NULL) {
-#line 2424 "MediaMonitor.c"
+#line 2431 "MediaMonitor.c"
 		GeeMap* _tmp64_ = NULL;
 		gint _tmp65_ = 0;
 		gint _tmp66_ = 0;
@@ -2470,7 +2477,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 			_g_object_unref0 (set_master_file);
 #line 343 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			return;
-#line 2474 "MediaMonitor.c"
+#line 2481 "MediaMonitor.c"
 		}
 	}
 #line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2479,18 +2486,18 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 	if (_tmp74_ != NULL) {
 #line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp73_ = TRUE;
-#line 2483 "MediaMonitor.c"
+#line 2490 "MediaMonitor.c"
 	} else {
 		GeeArrayList* _tmp75_ = NULL;
 #line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp75_ = to_online;
 #line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp73_ = _tmp75_ != NULL;
-#line 2490 "MediaMonitor.c"
+#line 2497 "MediaMonitor.c"
 	}
 #line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (_tmp73_) {
-#line 2494 "MediaMonitor.c"
+#line 2501 "MediaMonitor.c"
 		gint _tmp76_ = 0;
 		GeeArrayList* _tmp77_ = NULL;
 		gint _tmp81_ = 0;
@@ -2506,45 +2513,45 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 		_tmp77_ = to_online;
 #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		if (_tmp77_ != NULL) {
-#line 2510 "MediaMonitor.c"
+#line 2517 "MediaMonitor.c"
 			GeeArrayList* _tmp78_ = NULL;
 			gint _tmp79_ = 0;
 			gint _tmp80_ = 0;
 #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp78_ = to_online;
 #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-			_tmp79_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp79_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp80_ = _tmp79_;
 #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp76_ = _tmp80_;
-#line 2522 "MediaMonitor.c"
+#line 2529 "MediaMonitor.c"
 		} else {
 #line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp76_ = 0;
-#line 2526 "MediaMonitor.c"
+#line 2533 "MediaMonitor.c"
 		}
 #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp82_ = to_offline;
 #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		if (_tmp82_ != NULL) {
-#line 2532 "MediaMonitor.c"
+#line 2539 "MediaMonitor.c"
 			GeeArrayList* _tmp83_ = NULL;
 			gint _tmp84_ = 0;
 			gint _tmp85_ = 0;
 #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp83_ = to_offline;
 #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-			_tmp84_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp84_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp85_ = _tmp84_;
 #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp81_ = _tmp85_;
-#line 2544 "MediaMonitor.c"
+#line 2551 "MediaMonitor.c"
 		} else {
 #line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp81_ = 0;
-#line 2548 "MediaMonitor.c"
+#line 2555 "MediaMonitor.c"
 		}
 #line 347 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp86_ = media_monitor_to_string (self);
@@ -2582,7 +2589,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 			_g_object_unref0 (set_master_file);
 #line 352 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			return;
-#line 2586 "MediaMonitor.c"
+#line 2593 "MediaMonitor.c"
 		}
 	}
 #line 285 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2593,7 +2600,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
 	_g_object_unref0 (set_master_file_info);
 #line 285 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_g_object_unref0 (set_master_file);
-#line 2597 "MediaMonitor.c"
+#line 2604 "MediaMonitor.c"
 }
 
 
@@ -2602,14 +2609,14 @@ void media_monitor_process_updates (MediaMonitor* self, GeeCollection* all_updat
 	g_return_if_fail (IS_MEDIA_MONITOR (self));
 #line 285 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	MEDIA_MONITOR_GET_CLASS (self)->process_updates (self, all_updates, controller, op_count, error);
-#line 2606 "MediaMonitor.c"
+#line 2613 "MediaMonitor.c"
 }
 
 
 static gpointer _transaction_controller_ref0 (gpointer self) {
 #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	return self ? transaction_controller_ref (self) : NULL;
-#line 2613 "MediaMonitor.c"
+#line 2620 "MediaMonitor.c"
 }
 
 
@@ -2626,12 +2633,12 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 	GeeArrayList* to_remove = NULL;
 	gint op_count = 0;
 	GeeArrayList* _tmp29_ = NULL;
-	GeeArrayList* _tmp47_ = NULL;
+	GeeArrayList* _tmp48_ = NULL;
 	gdouble elapsed = 0.0;
-	GTimer* _tmp60_ = NULL;
-	gdouble _tmp61_ = 0.0;
-	gboolean _tmp62_ = FALSE;
-	gdouble _tmp63_ = 0.0;
+	GTimer* _tmp61_ = NULL;
+	gdouble _tmp62_ = 0.0;
+	gboolean _tmp63_ = FALSE;
+	gdouble _tmp64_ = 0.0;
 	GError * _inner_error_ = NULL;
 #line 356 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE);
@@ -2645,12 +2652,12 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 		result = FALSE;
 #line 358 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		return result;
-#line 2649 "MediaMonitor.c"
+#line 2656 "MediaMonitor.c"
 	}
 #line 360 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_tmp2_ = self->priv->pending_updates;
 #line 360 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	_tmp3_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MAP, GeeMap));
+	_tmp3_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 360 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_tmp4_ = _tmp3_;
 #line 360 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2659,7 +2666,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 		result = TRUE;
 #line 361 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		return result;
-#line 2663 "MediaMonitor.c"
+#line 2670 "MediaMonitor.c"
 	}
 #line 363 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	_tmp5_ = g_timer_new ();
@@ -2669,7 +2676,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 	to_process = NULL;
 #line 369 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	to_remove = NULL;
-#line 2673 "MediaMonitor.c"
+#line 2680 "MediaMonitor.c"
 	{
 		GeeIterator* _updates_it = NULL;
 		GeeHashMap* _tmp6_ = NULL;
@@ -2681,7 +2688,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp6_ = self->priv->pending_updates;
 #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_tmp7_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_MAP, GeeMap));
+		_tmp7_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_tmp8_ = _tmp7_;
 #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2696,7 +2703,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 		_updates_it = _tmp11_;
 #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		while (TRUE) {
-#line 2700 "MediaMonitor.c"
+#line 2707 "MediaMonitor.c"
 			GeeIterator* _tmp12_ = NULL;
 			gboolean _tmp13_ = FALSE;
 			MonitorableUpdates* updates = NULL;
@@ -2717,7 +2724,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 			if (!_tmp13_) {
 #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				break;
-#line 2721 "MediaMonitor.c"
+#line 2728 "MediaMonitor.c"
 			}
 #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp14_ = _updates_it;
@@ -2735,7 +2742,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 				_monitorable_updates_unref0 (updates);
 #line 372 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				continue;
-#line 2739 "MediaMonitor.c"
+#line 2746 "MediaMonitor.c"
 			}
 #line 374 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp18_ = updates;
@@ -2743,7 +2750,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 			_tmp19_ = monitorable_updates_is_all_updated (_tmp18_);
 #line 374 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			if (_tmp19_) {
-#line 2747 "MediaMonitor.c"
+#line 2754 "MediaMonitor.c"
 				GeeArrayList* _tmp20_ = NULL;
 				GeeArrayList* _tmp22_ = NULL;
 				MonitorableUpdates* _tmp23_ = NULL;
@@ -2752,15 +2759,15 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 				_tmp20_ = to_remove;
 #line 375 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				if (_tmp20_ == NULL) {
-#line 2756 "MediaMonitor.c"
+#line 2763 "MediaMonitor.c"
 					GeeArrayList* _tmp21_ = NULL;
 #line 376 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-					_tmp21_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_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"
 					_g_object_unref0 (to_remove);
 #line 376 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 					to_remove = _tmp21_;
-#line 2764 "MediaMonitor.c"
+#line 2771 "MediaMonitor.c"
 				}
 #line 378 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				_tmp22_ = to_remove;
@@ -2774,21 +2781,21 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 				_monitorable_updates_unref0 (updates);
 #line 379 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				continue;
-#line 2778 "MediaMonitor.c"
+#line 2785 "MediaMonitor.c"
 			}
 #line 382 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp25_ = to_process;
 #line 382 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			if (_tmp25_ == NULL) {
-#line 2784 "MediaMonitor.c"
+#line 2791 "MediaMonitor.c"
 				GeeArrayList* _tmp26_ = NULL;
 #line 383 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_tmp26_ = gee_array_list_new (TYPE_MONITORABLE_UPDATES, (GBoxedCopyFunc) monitorable_updates_ref, monitorable_updates_unref, NULL, NULL, NULL);
+				_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"
 				_g_object_unref0 (to_process);
 #line 383 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				to_process = _tmp26_;
-#line 2792 "MediaMonitor.c"
+#line 2799 "MediaMonitor.c"
 			}
 #line 385 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp27_ = to_process;
@@ -2798,11 +2805,11 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp28_);
 #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_monitorable_updates_unref0 (updates);
-#line 2802 "MediaMonitor.c"
+#line 2809 "MediaMonitor.c"
 		}
 #line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_g_object_unref0 (_updates_it);
-#line 2806 "MediaMonitor.c"
+#line 2813 "MediaMonitor.c"
 	}
 #line 388 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	op_count = 0;
@@ -2810,7 +2817,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 	_tmp29_ = to_process;
 #line 389 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	if (_tmp29_ != NULL) {
-#line 2814 "MediaMonitor.c"
+#line 2821 "MediaMonitor.c"
 		TransactionController* controller = NULL;
 		MediaSourceCollection* _tmp30_ = NULL;
 		MediaSourceCollection* _tmp31_ = NULL;
@@ -2834,7 +2841,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 		_data_collection_unref0 (_tmp31_);
 #line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		controller = _tmp35_;
-#line 2838 "MediaMonitor.c"
+#line 2845 "MediaMonitor.c"
 		{
 			TransactionController* _tmp36_ = NULL;
 			GeeArrayList* _tmp37_ = NULL;
@@ -2852,14 +2859,14 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 			media_monitor_process_updates (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection), _tmp38_, &op_count, &_inner_error_);
 #line 394 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2856 "MediaMonitor.c"
+#line 2863 "MediaMonitor.c"
 				goto __catch583_g_error;
 			}
 #line 395 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp39_ = controller;
 #line 395 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			transaction_controller_commit (_tmp39_);
-#line 2863 "MediaMonitor.c"
+#line 2870 "MediaMonitor.c"
 		}
 		goto __finally583;
 		__catch583_g_error:
@@ -2874,13 +2881,13 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 			_tmp40_ = err;
 #line 397 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			if (_tmp40_->domain == DATABASE_ERROR) {
-#line 2878 "MediaMonitor.c"
+#line 2885 "MediaMonitor.c"
 				GError* _tmp41_ = NULL;
 #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 2884 "MediaMonitor.c"
+#line 2891 "MediaMonitor.c"
 			} else {
 				const gchar* _tmp42_ = NULL;
 				GError* _tmp43_ = NULL;
@@ -2901,15 +2908,17 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 				app_window_panic (_tmp46_);
 #line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				_g_free0 (_tmp46_);
-#line 2905 "MediaMonitor.c"
+#line 2912 "MediaMonitor.c"
 			}
 #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_g_error_free0 (err);
-#line 2909 "MediaMonitor.c"
+#line 2916 "MediaMonitor.c"
 		}
 		__finally583:
 #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 2921 "MediaMonitor.c"
+			gboolean _tmp47_ = FALSE;
 #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_transaction_controller_unref0 (controller);
 #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2923,138 +2932,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 FALSE;
-#line 2928 "MediaMonitor.c"
+			return _tmp47_;
+#line 2937 "MediaMonitor.c"
 		}
 #line 389 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		_transaction_controller_unref0 (controller);
-#line 2932 "MediaMonitor.c"
+#line 2941 "MediaMonitor.c"
 	}
 #line 404 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	_tmp47_ = to_remove;
+	_tmp48_ = to_remove;
 #line 404 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	if (_tmp47_ != NULL) {
-#line 2938 "MediaMonitor.c"
+	if (_tmp48_ != NULL) {
+#line 2947 "MediaMonitor.c"
 		{
 			GeeArrayList* _monitorable_list = NULL;
-			GeeArrayList* _tmp48_ = NULL;
 			GeeArrayList* _tmp49_ = NULL;
-			gint _monitorable_size = 0;
 			GeeArrayList* _tmp50_ = NULL;
-			gint _tmp51_ = 0;
+			gint _monitorable_size = 0;
+			GeeArrayList* _tmp51_ = NULL;
 			gint _tmp52_ = 0;
+			gint _tmp53_ = 0;
 			gint _monitorable_index = 0;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-			_tmp48_ = to_remove;
+			_tmp49_ = to_remove;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-			_tmp49_ = _g_object_ref0 (_tmp48_);
+			_tmp50_ = _g_object_ref0 (_tmp49_);
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-			_monitorable_list = _tmp49_;
+			_monitorable_list = _tmp50_;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-			_tmp50_ = _monitorable_list;
+			_tmp51_ = _monitorable_list;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-			_tmp51_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp52_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-			_tmp52_ = _tmp51_;
+			_tmp53_ = _tmp52_;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-			_monitorable_size = _tmp52_;
+			_monitorable_size = _tmp53_;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_monitorable_index = -1;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			while (TRUE) {
-#line 2966 "MediaMonitor.c"
-				gint _tmp53_ = 0;
+#line 2975 "MediaMonitor.c"
 				gint _tmp54_ = 0;
 				gint _tmp55_ = 0;
+				gint _tmp56_ = 0;
 				Monitorable* monitorable = NULL;
-				GeeArrayList* _tmp56_ = NULL;
-				gint _tmp57_ = 0;
-				gpointer _tmp58_ = NULL;
-				Monitorable* _tmp59_ = NULL;
+				GeeArrayList* _tmp57_ = NULL;
+				gint _tmp58_ = 0;
+				gpointer _tmp59_ = NULL;
+				Monitorable* _tmp60_ = NULL;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_tmp53_ = _monitorable_index;
+				_tmp54_ = _monitorable_index;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_monitorable_index = _tmp53_ + 1;
+				_monitorable_index = _tmp54_ + 1;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_tmp54_ = _monitorable_index;
+				_tmp55_ = _monitorable_index;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_tmp55_ = _monitorable_size;
+				_tmp56_ = _monitorable_size;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				if (!(_tmp54_ < _tmp55_)) {
+				if (!(_tmp55_ < _tmp56_)) {
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 					break;
-#line 2987 "MediaMonitor.c"
+#line 2996 "MediaMonitor.c"
 				}
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_tmp56_ = _monitorable_list;
+				_tmp57_ = _monitorable_list;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_tmp57_ = _monitorable_index;
+				_tmp58_ = _monitorable_index;
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_tmp58_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp57_);
+				_tmp59_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp58_);
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				monitorable = (Monitorable*) _tmp58_;
+				monitorable = (Monitorable*) _tmp59_;
 #line 406 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				_tmp59_ = monitorable;
+				_tmp60_ = monitorable;
 #line 406 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-				media_monitor_remove_updates (self, _tmp59_);
+				media_monitor_remove_updates (self, _tmp60_);
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 				_g_object_unref0 (monitorable);
-#line 3003 "MediaMonitor.c"
+#line 3012 "MediaMonitor.c"
 			}
 #line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_g_object_unref0 (_monitorable_list);
-#line 3007 "MediaMonitor.c"
+#line 3016 "MediaMonitor.c"
 		}
 	}
 #line 409 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	_tmp60_ = timer;
+	_tmp61_ = timer;
 #line 409 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	_tmp61_ = g_timer_elapsed (_tmp60_, NULL);
+	_tmp62_ = g_timer_elapsed (_tmp61_, NULL);
 #line 409 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	elapsed = _tmp61_;
+	elapsed = _tmp62_;
 #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	_tmp63_ = elapsed;
+	_tmp64_ = elapsed;
 #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	if (_tmp63_ > 0.01) {
+	if (_tmp64_ > 0.01) {
 #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_tmp62_ = TRUE;
-#line 3022 "MediaMonitor.c"
+		_tmp63_ = TRUE;
+#line 3031 "MediaMonitor.c"
 	} else {
-		gint _tmp64_ = 0;
+		gint _tmp65_ = 0;
 #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_tmp64_ = op_count;
+		_tmp65_ = op_count;
 #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_tmp62_ = _tmp64_ > 0;
-#line 3029 "MediaMonitor.c"
+		_tmp63_ = _tmp65_ > 0;
+#line 3038 "MediaMonitor.c"
 	}
 #line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-	if (_tmp62_) {
-#line 3033 "MediaMonitor.c"
-		gchar* _tmp65_ = NULL;
+	if (_tmp63_) {
+#line 3042 "MediaMonitor.c"
 		gchar* _tmp66_ = NULL;
-		gdouble _tmp67_ = 0.0;
-		gint _tmp68_ = 0;
-		gchar* _tmp69_ = NULL;
+		gchar* _tmp67_ = NULL;
+		gdouble _tmp68_ = 0.0;
+		gint _tmp69_ = 0;
 		gchar* _tmp70_ = NULL;
+		gchar* _tmp71_ = NULL;
 #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_tmp65_ = media_monitor_to_string (self);
+		_tmp66_ = media_monitor_to_string (self);
 #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_tmp66_ = _tmp65_;
+		_tmp67_ = _tmp66_;
 #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_tmp67_ = elapsed;
+		_tmp68_ = elapsed;
 #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_tmp68_ = op_count;
+		_tmp69_ = op_count;
 #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_tmp69_ = g_strdup_printf ("Total pending queue time for %s: %lf (%d ops)", _tmp66_, _tmp67_, _tmp68_);
+		_tmp70_ = g_strdup_printf ("Total pending queue time for %s: %lf (%d ops)", _tmp67_, _tmp68_, _tmp69_);
 #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_tmp70_ = _tmp69_;
+		_tmp71_ = _tmp70_;
 #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		media_monitor_mdbg (_tmp70_);
+		media_monitor_mdbg (_tmp71_);
 #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_g_free0 (_tmp70_);
+		_g_free0 (_tmp71_);
 #line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
-		_g_free0 (_tmp66_);
-#line 3058 "MediaMonitor.c"
+		_g_free0 (_tmp67_);
+#line 3067 "MediaMonitor.c"
 	}
 #line 415 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	result = TRUE;
@@ -3066,7 +3075,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 3070 "MediaMonitor.c"
+#line 3079 "MediaMonitor.c"
 }
 
 
@@ -3076,46 +3085,46 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 3119 "MediaMonitor.c"
+#line 3128 "MediaMonitor.c"
 }
 
 
@@ -3124,12 +3133,12 @@ static void media_monitor_instance_init (MediaMonitor * self) {
 #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"
-	_tmp0_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_MONITORABLE_UPDATES, (GBoxedCopyFunc) monitorable_updates_ref, monitorable_updates_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_MONITORABLE_UPDATES, (GBoxedCopyFunc) monitorable_updates_ref, (GDestroyNotify) monitorable_updates_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 114 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	self->priv->pending_updates = _tmp0_;
 #line 116 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 	self->priv->pending_updates_timer_id = (guint) 0;
-#line 3133 "MediaMonitor.c"
+#line 3142 "MediaMonitor.c"
 }
 
 
@@ -3161,7 +3170,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 3165 "MediaMonitor.c"
+#line 3174 "MediaMonitor.c"
 }
 
 
diff --git a/src/MediaPage.c b/src/MediaPage.c
index b62ca6f..a6f60b1 100644
--- a/src/MediaPage.c
+++ b/src/MediaPage.c
@@ -1,4 +1,4 @@
-/* MediaPage.c generated by valac 0.34.4, the Vala compiler
+/* MediaPage.c generated by valac 0.34.7, the Vala compiler
  * generated from MediaPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2055,7 +2055,7 @@ 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 = 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"
@@ -6643,7 +6643,7 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 #line 930 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	need_warn = FALSE;
 #line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
@@ -6806,7 +6806,7 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 #line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp33_ = to_set;
 #line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp35_ = _tmp34_;
 #line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -8432,83 +8432,83 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
diff --git a/src/MediaViewTracker.c b/src/MediaViewTracker.c
index a858bc2..1bedba7 100644
--- a/src/MediaViewTracker.c
+++ b/src/MediaViewTracker.c
@@ -1,4 +1,4 @@
-/* MediaViewTracker.c generated by valac 0.34.4, the Vala compiler
+/* MediaViewTracker.c generated by valac 0.34.7, the Vala compiler
  * generated from MediaViewTracker.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/MetadataWriter.c b/src/MetadataWriter.c
index a19ad01..1a9aeea 100644
--- a/src/MetadataWriter.c
+++ b/src/MetadataWriter.c
@@ -1,4 +1,4 @@
-/* MetadataWriter.c generated by valac 0.34.4, the Vala compiler
+/* MetadataWriter.c generated by valac 0.34.7, the Vala compiler
  * generated from MetadataWriter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -956,7 +956,7 @@ static MetadataWriter* metadata_writer_construct (GType object_type) {
 #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"
-	_tmp0_ = hash_timed_queue_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, METADATA_WRITER_COMMIT_DELAY_MSEC, _metadata_writer_on_photo_dequeued_dequeued_callback, self, NULL, NULL, NULL, NULL, NULL, NULL, G_PRIORITY_DEFAULT);
+	_tmp0_ = hash_timed_queue_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, METADATA_WRITER_COMMIT_DELAY_MSEC, _metadata_writer_on_photo_dequeued_dequeued_callback, self, NULL, NULL, NULL, NULL, NULL, NULL, G_PRIORITY_DEFAULT);
 #line 180 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	_timed_queue_unref0 (self->priv->dirty);
 #line 180 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -1677,7 +1677,7 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite
 #line 1678 "MetadataWriter.c"
 					GeeHashSet* _tmp20_ = NULL;
 #line 364 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-					_tmp20_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+					_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"
@@ -1778,7 +1778,7 @@ static void metadata_writer_on_photos_altered (MetadataWriter* self, GeeMap* ite
 #line 1779 "MetadataWriter.c"
 							GeeHashSet* _tmp36_ = NULL;
 #line 380 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-							_tmp36_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+							_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"
@@ -2006,7 +2006,7 @@ static void metadata_writer_on_tags_altered (MetadataWriter* self, GeeMap* map)
 #line 2007 "MetadataWriter.c"
 				GeeHashSet* _tmp17_ = NULL;
 #line 408 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-				_tmp17_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+				_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"
@@ -2169,7 +2169,7 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta
 		gchar* _tmp25_ = NULL;
 		gchar* _tmp26_ = NULL;
 #line 426 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-		_tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+		_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"
@@ -2313,7 +2313,7 @@ static void metadata_writer_on_tag_contents_altered (MetadataWriter* self, Conta
 		gchar* _tmp46_ = NULL;
 		gchar* _tmp47_ = NULL;
 #line 437 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-		_tmp30_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+		_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"
@@ -2430,7 +2430,7 @@ static void metadata_writer_on_tag_backlink_removed (MetadataWriter* self, Conta
 #line 448 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
 #line 449 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-	_tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
@@ -2769,7 +2769,7 @@ static void metadata_writer_schedule_if_dirty (MetadataWriter* self, GeeIterable
 #line 2770 "MetadataWriter.c"
 					GeeArrayList* _tmp15_ = NULL;
 #line 513 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-					_tmp15_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_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"
@@ -3138,7 +3138,7 @@ static void metadata_writer_cancel_all (MetadataWriter* self, gboolean wait) {
 #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp1_ = self->priv->pending;
 #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-		_tmp2_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MAP, GeeMap));
+		_tmp2_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp3_ = _tmp2_;
 #line 569 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3371,7 +3371,7 @@ static void metadata_writer_on_photo_dequeued (MetadataWriter* self, LibraryPhot
 #line 3372 "MetadataWriter.c"
 		GeeHashSet* _tmp5_ = NULL;
 #line 612 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-		_tmp5_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+		_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"
@@ -4690,7 +4690,7 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 #line 4691 "MetadataWriter.c"
 	}
 #line 124 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-	_tmp39_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp39_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 124 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	safe_keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_SET, GeeSet);
 #line 133 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4870,7 +4870,7 @@ 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 = metadata_writer_commit_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) metadata_writer_commit_job_real_execute;
 #line 4875 "MetadataWriter.c"
 }
 
@@ -4950,15 +4950,15 @@ static void metadata_writer_instance_init (MetadataWriter * self) {
 #line 165 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self->priv->enabled = FALSE;
 #line 167 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-	_tmp1_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, METADATA_WRITER_TYPE_COMMIT_JOB, (GBoxedCopyFunc) background_job_ref, background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp1_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, METADATA_WRITER_TYPE_COMMIT_JOB, (GBoxedCopyFunc) background_job_ref, (GDestroyNotify) background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 167 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self->priv->pending = _tmp1_;
 #line 168 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-	_tmp2_ = gee_hash_set_new (METADATA_WRITER_TYPE_COMMIT_JOB, (GBoxedCopyFunc) background_job_ref, background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp2_ = gee_hash_set_new (METADATA_WRITER_TYPE_COMMIT_JOB, (GBoxedCopyFunc) background_job_ref, (GDestroyNotify) background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 168 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self->priv->pending_cancel = _tmp2_;
 #line 169 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-	_tmp3_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp3_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 169 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self->priv->interested_photo_details = _tmp3_;
 #line 170 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4972,7 +4972,7 @@ static void metadata_writer_instance_init (MetadataWriter * self) {
 #line 174 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	self->priv->pause_count = 0;
 #line 175 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-	_tmp4_ = gee_hash_set_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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"
diff --git a/src/NaturalCollate.c b/src/NaturalCollate.c
index 7466854..97255d0 100644
--- a/src/NaturalCollate.c
+++ b/src/NaturalCollate.c
@@ -1,4 +1,4 @@
-/* NaturalCollate.c generated by valac 0.34.4, the Vala compiler
+/* NaturalCollate.c generated by valac 0.34.7, the Vala compiler
  * generated from NaturalCollate.vala, do not modify */
 
 
diff --git a/src/Orientation.c b/src/Orientation.c
index c5d5b8d..eb6a450 100644
--- a/src/Orientation.c
+++ b/src/Orientation.c
@@ -1,4 +1,4 @@
-/* Orientation.c generated by valac 0.34.4, the Vala compiler
+/* Orientation.c generated by valac 0.34.7, the Vala compiler
  * generated from Orientation.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/Page.c b/src/Page.c
index 68114ac..2361d74 100644
--- a/src/Page.c
+++ b/src/Page.c
@@ -1,4 +1,4 @@
-/* Page.c generated by valac 0.34.4, the Vala compiler
+/* Page.c generated by valac 0.34.7, the Vala compiler
  * generated from Page.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2183,7 +2183,7 @@ static void injection_group_instance_init (InjectionGroup * self) {
 #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"
-	_tmp0_ = gee_array_list_new (INJECTION_GROUP_TYPE_ELEMENT, (GBoxedCopyFunc) injection_group_element_ref, injection_group_element_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (INJECTION_GROUP_TYPE_ELEMENT, (GBoxedCopyFunc) injection_group_element_ref, (GDestroyNotify) injection_group_element_unref, NULL, NULL, NULL);
 #line 28 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->elements = _tmp0_;
 #line 29 "/home/jens/Source/shotwell/src/Page.vala"
@@ -4592,7 +4592,7 @@ static void page_add_ui (Page* self) {
 #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"
-	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 504 "/home/jens/Source/shotwell/src/Page.vala"
 	ui_filenames = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
 #line 505 "/home/jens/Source/shotwell/src/Page.vala"
@@ -8313,107 +8313,107 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 8420 "Page.c"
@@ -10493,7 +10493,7 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 #line 10494 "Page.c"
 		}
 #line 1599 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp85_ = gee_array_list_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+		_tmp85_ = gee_array_list_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1599 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->previously_selected);
 #line 1599 "/home/jens/Source/shotwell/src/Page.vala"
@@ -12638,43 +12638,43 @@ static void checkerboard_page_class_init (CheckerboardPageClass * klass) {
 #line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (CheckerboardPagePrivate));
 #line 1209 "/home/jens/Source/shotwell/src/Page.vala"
-	((CheckerboardPageClass *) klass)->get_item_context_menu = checkerboard_page_real_get_item_context_menu;
+	((CheckerboardPageClass *) klass)->get_item_context_menu = (GtkMenu* (*)(CheckerboardPage*)) checkerboard_page_real_get_item_context_menu;
 #line 1209 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->get_page_context_menu = checkerboard_page_real_get_page_context_menu;
+	((PageClass *) klass)->get_page_context_menu = (GtkMenu* (*)(Page*)) checkerboard_page_real_get_page_context_menu;
 #line 1209 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_context_keypress = checkerboard_page_real_on_context_keypress;
+	((PageClass *) klass)->on_context_keypress = (gboolean (*)(Page*)) checkerboard_page_real_on_context_keypress;
 #line 1209 "/home/jens/Source/shotwell/src/Page.vala"
-	((CheckerboardPageClass *) klass)->get_view_empty_message = checkerboard_page_real_get_view_empty_message;
+	((CheckerboardPageClass *) klass)->get_view_empty_message = (gchar* (*)(CheckerboardPage*)) checkerboard_page_real_get_view_empty_message;
 #line 1209 "/home/jens/Source/shotwell/src/Page.vala"
-	((CheckerboardPageClass *) klass)->get_filter_no_match_message = checkerboard_page_real_get_filter_no_match_message;
+	((CheckerboardPageClass *) klass)->get_filter_no_match_message = (gchar* (*)(CheckerboardPage*)) checkerboard_page_real_get_filter_no_match_message;
 #line 1209 "/home/jens/Source/shotwell/src/Page.vala"
-	((CheckerboardPageClass *) klass)->on_item_activated = checkerboard_page_real_on_item_activated;
+	((CheckerboardPageClass *) klass)->on_item_activated = (void (*)(CheckerboardPage*, CheckerboardItem*, CheckerboardPageActivator, CheckerboardPageKeyboardModifiers*)) checkerboard_page_real_on_item_activated;
 #line 1209 "/home/jens/Source/shotwell/src/Page.vala"
-	((CheckerboardPageClass *) klass)->get_search_view_filter = checkerboard_page_real_get_search_view_filter;
+	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*)(CheckerboardPage*)) checkerboard_page_real_get_search_view_filter;
 #line 1209 "/home/jens/Source/shotwell/src/Page.vala"
-	((CheckerboardPageClass *) klass)->get_view_tracker = checkerboard_page_real_get_view_tracker;
+	((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*)(CheckerboardPage*)) checkerboard_page_real_get_view_tracker;
 #line 1209 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->switching_from = checkerboard_page_real_switching_from;
+	((PageClass *) klass)->switching_from = (void (*)(Page*)) checkerboard_page_real_switching_from;
 #line 1209 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->switched_to = checkerboard_page_real_switched_to;
+	((PageClass *) klass)->switched_to = (void (*)(Page*)) checkerboard_page_real_switched_to;
 #line 1209 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->set_page_name = checkerboard_page_real_set_page_name;
+	((PageClass *) klass)->set_page_name = (void (*)(Page*, const gchar*)) checkerboard_page_real_set_page_name;
 #line 1209 "/home/jens/Source/shotwell/src/Page.vala"
-	((GtkWidgetClass *) klass)->key_press_event = checkerboard_page_real_key_press_event;
+	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) checkerboard_page_real_key_press_event;
 #line 1209 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_left_click = checkerboard_page_real_on_left_click;
+	((PageClass *) klass)->on_left_click = (gboolean (*)(Page*, GdkEventButton*)) checkerboard_page_real_on_left_click;
 #line 1209 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_left_released = checkerboard_page_real_on_left_released;
+	((PageClass *) klass)->on_left_released = (gboolean (*)(Page*, GdkEventButton*)) checkerboard_page_real_on_left_released;
 #line 1209 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_right_click = checkerboard_page_real_on_right_click;
+	((PageClass *) klass)->on_right_click = (gboolean (*)(Page*, GdkEventButton*)) checkerboard_page_real_on_right_click;
 #line 1209 "/home/jens/Source/shotwell/src/Page.vala"
-	((CheckerboardPageClass *) klass)->on_mouse_over = checkerboard_page_real_on_mouse_over;
+	((CheckerboardPageClass *) klass)->on_mouse_over = (gboolean (*)(CheckerboardPage*, CheckerboardItem*, gint, gint, GdkModifierType)) checkerboard_page_real_on_mouse_over;
 #line 1209 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_motion = checkerboard_page_real_on_motion;
+	((PageClass *) klass)->on_motion = (gboolean (*)(Page*, GdkEventMotion*, gint, gint, GdkModifierType)) checkerboard_page_real_on_motion;
 #line 1209 "/home/jens/Source/shotwell/src/Page.vala"
-	((CheckerboardPageClass *) klass)->set_display_titles = checkerboard_page_real_set_display_titles;
+	((CheckerboardPageClass *) klass)->set_display_titles = (void (*)(CheckerboardPage*, gboolean)) checkerboard_page_real_set_display_titles;
 #line 1209 "/home/jens/Source/shotwell/src/Page.vala"
-	((CheckerboardPageClass *) klass)->set_display_comments = checkerboard_page_real_set_display_comments;
+	((CheckerboardPageClass *) klass)->set_display_comments = (void (*)(CheckerboardPage*, gboolean)) checkerboard_page_real_set_display_comments;
 #line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = checkerboard_page_finalize;
 #line 12681 "Page.c"
@@ -15027,35 +15027,35 @@ static void single_photo_page_class_init (SinglePhotoPageClass * klass) {
 #line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (SinglePhotoPagePrivate));
 #line 1954 "/home/jens/Source/shotwell/src/Page.vala"
-	((SinglePhotoPageClass *) klass)->is_zoom_supported = single_photo_page_real_is_zoom_supported;
+	((SinglePhotoPageClass *) klass)->is_zoom_supported = (gboolean (*)(SinglePhotoPage*)) single_photo_page_real_is_zoom_supported;
 #line 1954 "/home/jens/Source/shotwell/src/Page.vala"
-	((SinglePhotoPageClass *) klass)->cancel_zoom = single_photo_page_real_cancel_zoom;
+	((SinglePhotoPageClass *) klass)->cancel_zoom = (void (*)(SinglePhotoPage*)) single_photo_page_real_cancel_zoom;
 #line 1954 "/home/jens/Source/shotwell/src/Page.vala"
-	((SinglePhotoPageClass *) klass)->save_zoom_state = single_photo_page_real_save_zoom_state;
+	((SinglePhotoPageClass *) klass)->save_zoom_state = (void (*)(SinglePhotoPage*)) single_photo_page_real_save_zoom_state;
 #line 1954 "/home/jens/Source/shotwell/src/Page.vala"
-	((SinglePhotoPageClass *) klass)->restore_zoom_state = single_photo_page_real_restore_zoom_state;
+	((SinglePhotoPageClass *) klass)->restore_zoom_state = (void (*)(SinglePhotoPage*)) single_photo_page_real_restore_zoom_state;
 #line 1954 "/home/jens/Source/shotwell/src/Page.vala"
-	((SinglePhotoPageClass *) klass)->get_zoom_buffer = single_photo_page_real_get_zoom_buffer;
+	((SinglePhotoPageClass *) klass)->get_zoom_buffer = (ZoomBuffer* (*)(SinglePhotoPage*)) single_photo_page_real_get_zoom_buffer;
 #line 1954 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->switched_to = single_photo_page_real_switched_to;
+	((PageClass *) klass)->switched_to = (void (*)(Page*)) single_photo_page_real_switched_to;
 #line 1954 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->set_container = single_photo_page_real_set_container;
+	((PageClass *) klass)->set_container = (void (*)(Page*, GtkWindow*)) single_photo_page_real_set_container;
 #line 1954 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_resize_finished = single_photo_page_real_on_resize_finished;
+	((PageClass *) klass)->on_resize_finished = (void (*)(Page*, GdkRectangle*)) single_photo_page_real_on_resize_finished;
 #line 1954 "/home/jens/Source/shotwell/src/Page.vala"
-	((SinglePhotoPageClass *) klass)->new_surface = single_photo_page_real_new_surface;
+	((SinglePhotoPageClass *) klass)->new_surface = (void (*)(SinglePhotoPage*, cairo_t*, Dimensions*)) single_photo_page_real_new_surface;
 #line 1954 "/home/jens/Source/shotwell/src/Page.vala"
-	((SinglePhotoPageClass *) klass)->updated_pixbuf = single_photo_page_real_updated_pixbuf;
+	((SinglePhotoPageClass *) klass)->updated_pixbuf = (void (*)(SinglePhotoPage*, GdkPixbuf*, SinglePhotoPageUpdateReason, Dimensions*)) single_photo_page_real_updated_pixbuf;
 #line 1954 "/home/jens/Source/shotwell/src/Page.vala"
-	((SinglePhotoPageClass *) klass)->paint = single_photo_page_real_paint;
+	((SinglePhotoPageClass *) klass)->paint = (void (*)(SinglePhotoPage*, cairo_t*, Dimensions*)) single_photo_page_real_paint;
 #line 1954 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->on_context_keypress = single_photo_page_real_on_context_keypress;
+	((PageClass *) klass)->on_context_keypress = (gboolean (*)(Page*)) single_photo_page_real_on_context_keypress;
 #line 1954 "/home/jens/Source/shotwell/src/Page.vala"
-	((SinglePhotoPageClass *) klass)->on_previous_photo = single_photo_page_real_on_previous_photo;
+	((SinglePhotoPageClass *) klass)->on_previous_photo = (void (*)(SinglePhotoPage*)) single_photo_page_real_on_previous_photo;
 #line 1954 "/home/jens/Source/shotwell/src/Page.vala"
-	((SinglePhotoPageClass *) klass)->on_next_photo = single_photo_page_real_on_next_photo;
+	((SinglePhotoPageClass *) klass)->on_next_photo = (void (*)(SinglePhotoPage*)) single_photo_page_real_on_next_photo;
 #line 1954 "/home/jens/Source/shotwell/src/Page.vala"
-	((GtkWidgetClass *) klass)->key_press_event = single_photo_page_real_key_press_event;
+	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) single_photo_page_real_key_press_event;
 #line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = single_photo_page_finalize;
 #line 15062 "Page.c"
diff --git a/src/Photo.c b/src/Photo.c
index b890199..dffc7d4 100644
--- a/src/Photo.c
+++ b/src/Photo.c
@@ -1,4 +1,4 @@
-/* Photo.c generated by valac 0.34.4, the Vala compiler
+/* Photo.c generated by valac 0.34.7, the Vala compiler
  * generated from Photo.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -4037,7 +4037,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		gint _tmp53_ = 0;
 		RawDeveloper* _tmp54_ = NULL;
 #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, backing_photo_row_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+		_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"
 		_g_object_unref0 (self->priv->developments);
 #line 438 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4314,7 +4314,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 void photo_init_photo (void) {
 	GeeLinkedList* _tmp0_ = NULL;
 #line 475 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp0_ = gee_linked_list_new (PHOTO_TYPE_CACHED_PIXBUF, (GBoxedCopyFunc) photo_cached_pixbuf_ref, photo_cached_pixbuf_unref, NULL, NULL, NULL);
+	_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"
@@ -4493,11 +4493,11 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 	gboolean result = FALSE;
 	gboolean ret = FALSE;
 	GFile* file = NULL;
-	PhotoFileFormat _tmp7_ = 0;
-	GFile* _tmp11_ = NULL;
-	gboolean _tmp22_ = FALSE;
-	gboolean _tmp23_ = FALSE;
+	PhotoFileFormat _tmp8_ = 0;
+	GFile* _tmp12_ = NULL;
 	gboolean _tmp24_ = FALSE;
+	gboolean _tmp25_ = FALSE;
+	gboolean _tmp26_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 515 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
@@ -4550,92 +4550,94 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 		}
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 4554 "Photo.c"
+			gboolean _tmp7_ = FALSE;
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
-			return FALSE;
-#line 4560 "Photo.c"
+			return _tmp7_;
+#line 4562 "Photo.c"
 		}
 	}
 #line 523 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_detach_editable (self, TRUE, FALSE, TRUE);
 #line 525 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp7_ = photo_get_master_file_format (self);
+	_tmp8_ = photo_get_master_file_format (self);
 #line 525 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp7_ == PHOTO_FILE_FORMAT_RAW) {
-#line 4569 "Photo.c"
-		gint _tmp8_ = 0;
-		RawDeveloper* _tmp9_ = NULL;
+	if (_tmp8_ == PHOTO_FILE_FORMAT_RAW) {
+#line 4571 "Photo.c"
+		gint _tmp9_ = 0;
+		RawDeveloper* _tmp10_ = NULL;
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp9_ = raw_developer_as_array (&_tmp8_);
-#line 4574 "Photo.c"
+		_tmp10_ = raw_developer_as_array (&_tmp9_);
+#line 4576 "Photo.c"
 		{
 			RawDeveloper* d_collection = NULL;
 			gint d_collection_length1 = 0;
 			gint _d_collection_size_ = 0;
 			gint d_it = 0;
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
-			d_collection = _tmp9_;
+			d_collection = _tmp10_;
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
-			d_collection_length1 = _tmp8_;
+			d_collection_length1 = _tmp9_;
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
-			for (d_it = 0; d_it < _tmp8_; d_it = d_it + 1) {
-#line 4586 "Photo.c"
+			for (d_it = 0; d_it < _tmp9_; d_it = d_it + 1) {
+#line 4588 "Photo.c"
 				RawDeveloper d = 0;
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
 				d = d_collection[d_it];
-#line 4590 "Photo.c"
+#line 4592 "Photo.c"
 				{
-					RawDeveloper _tmp10_ = 0;
+					RawDeveloper _tmp11_ = 0;
 #line 527 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp10_ = d;
+					_tmp11_ = d;
 #line 527 "/home/jens/Source/shotwell/src/Photo.vala"
-					photo_delete_raw_development (self, _tmp10_);
-#line 4597 "Photo.c"
+					photo_delete_raw_development (self, _tmp11_);
+#line 4599 "Photo.c"
 				}
 			}
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
 			d_collection = (g_free (d_collection), NULL);
-#line 4602 "Photo.c"
+#line 4604 "Photo.c"
 		}
 	}
 #line 531 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp11_ = file;
+	_tmp12_ = file;
 #line 531 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp11_ != NULL) {
-#line 4609 "Photo.c"
+	if (_tmp12_ != NULL) {
+#line 4611 "Photo.c"
 		{
-			gboolean _tmp12_ = FALSE;
-			GFile* _tmp13_ = NULL;
-			gboolean _tmp14_ = FALSE;
+			gboolean _tmp13_ = FALSE;
+			GFile* _tmp14_ = NULL;
+			gboolean _tmp15_ = FALSE;
 #line 533 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp13_ = file;
+			_tmp14_ = file;
 #line 533 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp14_ = g_file_trash (_tmp13_, NULL, &_inner_error_);
+			_tmp15_ = g_file_trash (_tmp14_, NULL, &_inner_error_);
 #line 533 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp12_ = _tmp14_;
+			_tmp13_ = _tmp15_;
 #line 533 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4622 "Photo.c"
+#line 4624 "Photo.c"
 				goto __catch258_g_error;
 			}
 #line 533 "/home/jens/Source/shotwell/src/Photo.vala"
-			ret = _tmp12_;
-#line 4627 "Photo.c"
+			ret = _tmp13_;
+#line 4629 "Photo.c"
 		}
 		goto __finally258;
 		__catch258_g_error:
 		{
 			GError* err = NULL;
-			GFile* _tmp15_ = NULL;
-			gchar* _tmp16_ = NULL;
+			GFile* _tmp16_ = NULL;
 			gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
 			gchar* _tmp19_ = NULL;
-			GError* _tmp20_ = NULL;
-			const gchar* _tmp21_ = NULL;
+			gchar* _tmp20_ = NULL;
+			GError* _tmp21_ = NULL;
+			const gchar* _tmp22_ = NULL;
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4643,76 +4645,80 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 #line 535 "/home/jens/Source/shotwell/src/Photo.vala"
 			ret = FALSE;
 #line 536 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp15_ = file;
+			_tmp16_ = file;
 #line 536 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp16_ = g_file_get_path (_tmp15_);
+			_tmp17_ = g_file_get_path (_tmp16_);
 #line 536 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp17_ = _tmp16_;
+			_tmp18_ = _tmp17_;
 #line 536 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp18_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
+			_tmp19_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
 #line 536 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp19_ = _tmp18_;
+			_tmp20_ = _tmp19_;
 #line 536 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp20_ = err;
+			_tmp21_ = err;
 #line 536 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp21_ = _tmp20_->message;
+			_tmp22_ = _tmp21_->message;
 #line 536 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_message ("Photo.vala:536: Unable to move editable %s for %s to trash: %s", _tmp17_, _tmp19_, _tmp21_);
+			g_message ("Photo.vala:536: Unable to move editable %s for %s to trash: %s", _tmp18_, _tmp20_, _tmp22_);
 #line 536 "/home/jens/Source/shotwell/src/Photo.vala"
-			_g_free0 (_tmp19_);
+			_g_free0 (_tmp20_);
 #line 536 "/home/jens/Source/shotwell/src/Photo.vala"
-			_g_free0 (_tmp17_);
+			_g_free0 (_tmp18_);
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 4668 "Photo.c"
+#line 4670 "Photo.c"
 		}
 		__finally258:
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 4675 "Photo.c"
+			gboolean _tmp23_ = FALSE;
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
-			return FALSE;
-#line 4679 "Photo.c"
+			return _tmp23_;
+#line 4683 "Photo.c"
 		}
 	}
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp24_ = DATA_SOURCE_CLASS (photo_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_);
+	_tmp26_ = DATA_SOURCE_CLASS (photo_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_);
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp23_ = _tmp24_;
+	_tmp25_ = _tmp26_;
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 4692 "Photo.c"
+		gboolean _tmp27_ = FALSE;
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 4694 "Photo.c"
+		return _tmp27_;
+#line 4700 "Photo.c"
 	}
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp23_) {
-#line 4698 "Photo.c"
-		gboolean _tmp25_ = FALSE;
+	if (_tmp25_) {
+#line 4704 "Photo.c"
+		gboolean _tmp28_ = FALSE;
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp25_ = ret;
+		_tmp28_ = ret;
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp22_ = _tmp25_;
-#line 4704 "Photo.c"
+		_tmp24_ = _tmp28_;
+#line 4710 "Photo.c"
 	} else {
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp22_ = FALSE;
-#line 4708 "Photo.c"
+		_tmp24_ = FALSE;
+#line 4714 "Photo.c"
 	}
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
-	result = _tmp22_;
+	result = _tmp24_;
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 4716 "Photo.c"
+#line 4722 "Photo.c"
 }
 
 
@@ -4737,11 +4743,11 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 		result = NULL;
 #line 549 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 4741 "Photo.c"
+#line 4747 "Photo.c"
 	}
 #line 551 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing_row = NULL;
-#line 4745 "Photo.c"
+#line 4751 "Photo.c"
 	{
 		BackingPhotoRow* _tmp2_ = NULL;
 		BackingPhotoTable* _tmp3_ = NULL;
@@ -4768,7 +4774,7 @@ 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 4772 "Photo.c"
+#line 4778 "Photo.c"
 				goto __catch259_database_error;
 			}
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4779,7 +4785,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 4783 "Photo.c"
+#line 4789 "Photo.c"
 		}
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = _tmp2_;
@@ -4791,7 +4797,7 @@ 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 4795 "Photo.c"
+#line 4801 "Photo.c"
 	}
 	goto __finally259;
 	__catch259_database_error:
@@ -4819,7 +4825,7 @@ 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 4823 "Photo.c"
+#line 4829 "Photo.c"
 	}
 	__finally259:
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4832,13 +4838,13 @@ 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 4836 "Photo.c"
+#line 4842 "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 4842 "Photo.c"
+#line 4848 "Photo.c"
 		{
 			BackingPhotoTable* _tmp14_ = NULL;
 			BackingPhotoTable* _tmp15_ = NULL;
@@ -4857,7 +4863,7 @@ 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 4861 "Photo.c"
+#line 4867 "Photo.c"
 					goto __catch260_database_error;
 				}
 #line 560 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4868,7 +4874,7 @@ 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 4872 "Photo.c"
+#line 4878 "Photo.c"
 			}
 		}
 		goto __finally260;
@@ -4881,7 +4887,7 @@ 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 4885 "Photo.c"
+#line 4891 "Photo.c"
 		}
 		__finally260:
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4894,7 +4900,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 4898 "Photo.c"
+#line 4904 "Photo.c"
 		}
 #line 564 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = NULL;
@@ -4902,13 +4908,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 4906 "Photo.c"
+#line 4912 "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 4912 "Photo.c"
+#line 4918 "Photo.c"
 }
 
 
@@ -4917,14 +4923,15 @@ 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 4921 "Photo.c"
+#line 4927 "Photo.c"
 	{
 		GeeHashMap* _tmp0_ = NULL;
+		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 4928 "Photo.c"
+#line 4935 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			GeeHashMap* _tmp2_ = NULL;
@@ -4938,7 +4945,7 @@ 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 4942 "Photo.c"
+#line 4949 "Photo.c"
 				GeeHashMap* _tmp5_ = NULL;
 				RawDeveloper _tmp6_ = 0;
 				gpointer _tmp7_ = NULL;
@@ -4961,26 +4968,26 @@ 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 4965 "Photo.c"
+#line 4972 "Photo.c"
 			} else {
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 4969 "Photo.c"
+#line 4976 "Photo.c"
 			}
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 4973 "Photo.c"
+#line 4980 "Photo.c"
 			{
 				GeeHashMap* _tmp11_ = NULL;
 #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 4980 "Photo.c"
+#line 4987 "Photo.c"
 			}
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 4984 "Photo.c"
+#line 4991 "Photo.c"
 		}
 		__finally261:
 		{
@@ -4989,33 +4996,33 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) {
 			_tmp12_ = self->priv->developments;
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 4993 "Photo.c"
+#line 5000 "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);
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 5001 "Photo.c"
+		return _tmp13_;
+#line 5008 "Photo.c"
 	}
 }
 
 
 gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 	gboolean result = FALSE;
-	RawDeveloper _tmp6_ = 0;
+	RawDeveloper _tmp7_ = 0;
 	GError * _inner_error_ = NULL;
 #line 580 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 5012 "Photo.c"
+#line 5019 "Photo.c"
 	{
 		GeeHashMap* _tmp0_ = NULL;
 #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 5019 "Photo.c"
+#line 5026 "Photo.c"
 		{
 			GeeHashMap* _tmp1_ = NULL;
 			RawDeveloper _tmp2_ = 0;
@@ -5030,18 +5037,18 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 			if (_tmp3_) {
 #line 583 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = TRUE;
-#line 5034 "Photo.c"
+#line 5041 "Photo.c"
 				{
 					GeeHashMap* _tmp4_ = NULL;
 #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 5041 "Photo.c"
+#line 5048 "Photo.c"
 				}
 #line 583 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 5045 "Photo.c"
+#line 5052 "Photo.c"
 			}
 		}
 		__finally262:
@@ -5051,101 +5058,103 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 			_tmp5_ = self->priv->developments;
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 5055 "Photo.c"
+#line 5062 "Photo.c"
 		}
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 5066 "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);
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
-			return FALSE;
-#line 5065 "Photo.c"
+			return _tmp6_;
+#line 5074 "Photo.c"
 		}
 	}
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp6_ = d;
+	_tmp7_ = d;
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
-	switch (_tmp6_) {
+	switch (_tmp7_) {
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 5074 "Photo.c"
+#line 5083 "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 5080 "Photo.c"
+#line 5089 "Photo.c"
 		}
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 5084 "Photo.c"
+#line 5093 "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 5090 "Photo.c"
+#line 5099 "Photo.c"
 		}
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 5094 "Photo.c"
+#line 5103 "Photo.c"
 		{
 			{
 				PhotoMetadata* meta = NULL;
-				PhotoMetadata* _tmp7_ = NULL;
-				guint num_previews = 0U;
 				PhotoMetadata* _tmp8_ = NULL;
-				guint _tmp9_ = 0U;
+				guint num_previews = 0U;
+				PhotoMetadata* _tmp9_ = NULL;
 				guint _tmp10_ = 0U;
+				guint _tmp11_ = 0U;
 #line 595 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp7_ = photo_get_master_metadata (self, &_inner_error_);
+				_tmp8_ = photo_get_master_metadata (self, &_inner_error_);
 #line 595 "/home/jens/Source/shotwell/src/Photo.vala"
-				meta = _tmp7_;
+				meta = _tmp8_;
 #line 595 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5109 "Photo.c"
+#line 5118 "Photo.c"
 					goto __catch263_g_error;
 				}
 #line 596 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp8_ = meta;
+				_tmp9_ = meta;
 #line 596 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp9_ = photo_metadata_get_preview_count (_tmp8_);
+				_tmp10_ = photo_metadata_get_preview_count (_tmp9_);
 #line 596 "/home/jens/Source/shotwell/src/Photo.vala"
-				num_previews = _tmp9_;
+				num_previews = _tmp10_;
 #line 598 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp10_ = num_previews;
+				_tmp11_ = num_previews;
 #line 598 "/home/jens/Source/shotwell/src/Photo.vala"
-				if (_tmp10_ > ((guint) 0)) {
-#line 5122 "Photo.c"
+				if (_tmp11_ > ((guint) 0)) {
+#line 5131 "Photo.c"
 					PhotoPreview* prev = NULL;
-					PhotoMetadata* _tmp11_ = NULL;
-					guint _tmp12_ = 0U;
-					PhotoPreview* _tmp13_ = NULL;
+					PhotoMetadata* _tmp12_ = NULL;
+					guint _tmp13_ = 0U;
 					PhotoPreview* _tmp14_ = NULL;
-					Dimensions dims = {0};
 					PhotoPreview* _tmp15_ = NULL;
-					Dimensions _tmp16_ = {0};
-					gint _tmp17_ = 0;
-					Dimensions _tmp18_ = {0};
-					gint _tmp19_ = 0;
-					Dimensions _tmp20_ = {0};
-					gint _tmp21_ = 0;
+					Dimensions dims = {0};
+					PhotoPreview* _tmp16_ = NULL;
+					Dimensions _tmp17_ = {0};
+					gint _tmp18_ = 0;
+					Dimensions _tmp19_ = {0};
+					gint _tmp20_ = 0;
+					Dimensions _tmp21_ = {0};
+					gint _tmp22_ = 0;
 					gint preview_major_axis = 0;
-					gint _tmp26_ = 0;
+					gint _tmp27_ = 0;
 #line 599 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp11_ = meta;
+					_tmp12_ = meta;
 #line 599 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp12_ = num_previews;
+					_tmp13_ = num_previews;
 #line 599 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp13_ = photo_metadata_get_preview (_tmp11_, _tmp12_ - 1);
+					_tmp14_ = photo_metadata_get_preview (_tmp12_, _tmp13_ - 1);
 #line 599 "/home/jens/Source/shotwell/src/Photo.vala"
-					prev = _tmp13_;
+					prev = _tmp14_;
 #line 602 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp14_ = prev;
+					_tmp15_ = prev;
 #line 602 "/home/jens/Source/shotwell/src/Photo.vala"
-					if (_tmp14_ == NULL) {
+					if (_tmp15_ == NULL) {
 #line 603 "/home/jens/Source/shotwell/src/Photo.vala"
 						result = FALSE;
 #line 603 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5154,51 +5163,51 @@ 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 5158 "Photo.c"
+#line 5167 "Photo.c"
 					}
 #line 605 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp15_ = prev;
+					_tmp16_ = prev;
 #line 605 "/home/jens/Source/shotwell/src/Photo.vala"
-					photo_preview_get_pixel_dimensions (_tmp15_, &_tmp16_);
+					photo_preview_get_pixel_dimensions (_tmp16_, &_tmp17_);
 #line 605 "/home/jens/Source/shotwell/src/Photo.vala"
-					dims = _tmp16_;
+					dims = _tmp17_;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp18_ = dims;
+					_tmp19_ = dims;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp19_ = _tmp18_.width;
+					_tmp20_ = _tmp19_.width;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp20_ = dims;
+					_tmp21_ = dims;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp21_ = _tmp20_.height;
+					_tmp22_ = _tmp21_.height;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
-					if (_tmp19_ > _tmp21_) {
-#line 5176 "Photo.c"
-						Dimensions _tmp22_ = {0};
-						gint _tmp23_ = 0;
+					if (_tmp20_ > _tmp22_) {
+#line 5185 "Photo.c"
+						Dimensions _tmp23_ = {0};
+						gint _tmp24_ = 0;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
-						_tmp22_ = dims;
+						_tmp23_ = dims;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
-						_tmp23_ = _tmp22_.width;
+						_tmp24_ = _tmp23_.width;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
-						_tmp17_ = _tmp23_;
-#line 5185 "Photo.c"
+						_tmp18_ = _tmp24_;
+#line 5194 "Photo.c"
 					} else {
-						Dimensions _tmp24_ = {0};
-						gint _tmp25_ = 0;
+						Dimensions _tmp25_ = {0};
+						gint _tmp26_ = 0;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
-						_tmp24_ = dims;
+						_tmp25_ = dims;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
-						_tmp25_ = _tmp24_.height;
+						_tmp26_ = _tmp25_.height;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
-						_tmp17_ = _tmp25_;
-#line 5195 "Photo.c"
+						_tmp18_ = _tmp26_;
+#line 5204 "Photo.c"
 					}
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
-					preview_major_axis = _tmp17_;
+					preview_major_axis = _tmp18_;
 #line 609 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp26_ = preview_major_axis;
+					_tmp27_ = preview_major_axis;
 #line 609 "/home/jens/Source/shotwell/src/Photo.vala"
-					if (_tmp26_ < PHOTO_MIN_EMBEDDED_SIZE) {
+					if (_tmp27_ < PHOTO_MIN_EMBEDDED_SIZE) {
 #line 610 "/home/jens/Source/shotwell/src/Photo.vala"
 						result = FALSE;
 #line 610 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5207,7 +5216,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 5211 "Photo.c"
+#line 5220 "Photo.c"
 					}
 #line 613 "/home/jens/Source/shotwell/src/Photo.vala"
 					result = TRUE;
@@ -5217,7 +5226,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 5221 "Photo.c"
+#line 5230 "Photo.c"
 				}
 #line 617 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = FALSE;
@@ -5225,50 +5234,52 @@ 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 5229 "Photo.c"
+#line 5238 "Photo.c"
 			}
 			goto __finally263;
 			__catch263_g_error:
 			{
 				GError* e = NULL;
-				GError* _tmp27_ = NULL;
-				const gchar* _tmp28_ = NULL;
+				GError* _tmp28_ = NULL;
+				const gchar* _tmp29_ = NULL;
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
 				e = _inner_error_;
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
 				_inner_error_ = NULL;
 #line 619 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp27_ = e;
+				_tmp28_ = e;
 #line 619 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp28_ = _tmp27_->message;
+				_tmp29_ = _tmp28_->message;
 #line 619 "/home/jens/Source/shotwell/src/Photo.vala"
-				g_debug ("Photo.vala:619: Error accessing embedded preview. Message: %s", _tmp28_);
+				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 5249 "Photo.c"
+#line 5258 "Photo.c"
 			}
 			__finally263:
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 5263 "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);
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
-				return FALSE;
-#line 5260 "Photo.c"
+				return _tmp30_;
+#line 5271 "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 5266 "Photo.c"
+#line 5277 "Photo.c"
 		}
 		default:
 		{
 #line 624 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_assert_not_reached ();
-#line 5272 "Photo.c"
+#line 5283 "Photo.c"
 		}
 	}
 }
@@ -5299,7 +5310,7 @@ 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 5303 "Photo.c"
+#line 5314 "Photo.c"
 	}
 	{
 		GeeHashMap* _tmp3_ = NULL;
@@ -5307,7 +5318,7 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi
 		_tmp3_ = self->priv->developments;
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 5311 "Photo.c"
+#line 5322 "Photo.c"
 		{
 			GeeHashMap* _tmp4_ = NULL;
 			RawDeveloper _tmp5_ = 0;
@@ -5320,7 +5331,7 @@ 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 5324 "Photo.c"
+#line 5335 "Photo.c"
 		}
 		__finally264:
 		{
@@ -5329,7 +5340,7 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi
 			_tmp7_ = self->priv->developments;
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 5333 "Photo.c"
+#line 5344 "Photo.c"
 		}
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5337,7 +5348,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 5341 "Photo.c"
+#line 5352 "Photo.c"
 		}
 	}
 #line 636 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5348,7 +5359,7 @@ 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 5352 "Photo.c"
+#line 5363 "Photo.c"
 }
 
 
@@ -5421,7 +5432,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 5425 "Photo.c"
+#line 5436 "Photo.c"
 	}
 #line 644 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = info;
@@ -5451,7 +5462,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 5455 "Photo.c"
+#line 5466 "Photo.c"
 	}
 #line 650 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = interrogator;
@@ -5465,7 +5476,7 @@ 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 5469 "Photo.c"
+#line 5480 "Photo.c"
 	} else {
 		PhotoFileInterrogator* _tmp14_ = NULL;
 		gboolean _tmp15_ = FALSE;
@@ -5475,7 +5486,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 		_tmp15_ = photo_file_interrogator_get_is_photo_corrupted (_tmp14_);
 #line 651 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp15_;
-#line 5479 "Photo.c"
+#line 5490 "Photo.c"
 	}
 #line 651 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_) {
@@ -5489,7 +5500,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 5493 "Photo.c"
+#line 5504 "Photo.c"
 	}
 #line 657 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = bpr;
@@ -5521,7 +5532,7 @@ 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 5525 "Photo.c"
+#line 5536 "Photo.c"
 		DetectedPhotoInformation* _tmp28_ = NULL;
 		PhotoMetadata* _tmp29_ = NULL;
 		Orientation _tmp30_ = 0;
@@ -5533,11 +5544,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 5537 "Photo.c"
+#line 5548 "Photo.c"
 	} else {
 #line 661 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = ORIENTATION_TOP_LEFT;
-#line 5541 "Photo.c"
+#line 5552 "Photo.c"
 	}
 #line 660 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = bpr;
@@ -5567,7 +5578,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 5571 "Photo.c"
+#line 5582 "Photo.c"
 	}
 #line 665 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_table_get_instance ();
@@ -5599,7 +5610,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 5603 "Photo.c"
+#line 5614 "Photo.c"
 	}
 #line 639 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
@@ -5609,7 +5620,7 @@ 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 5613 "Photo.c"
+#line 5624 "Photo.c"
 }
 
 
@@ -5630,7 +5641,7 @@ 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 5634 "Photo.c"
+#line 5645 "Photo.c"
 		{
 			{
 				BackingPhotoRow* _tmp1_ = NULL;
@@ -5670,7 +5681,7 @@ 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 5674 "Photo.c"
+#line 5685 "Photo.c"
 					goto __catch265_g_error;
 				}
 #line 678 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5683,14 +5694,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				bps = _tmp7_;
 #line 679 "/home/jens/Source/shotwell/src/Photo.vala"
 				pix = NULL;
-#line 5687 "Photo.c"
+#line 5698 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp8_ = NULL;
 #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 5694 "Photo.c"
+#line 5705 "Photo.c"
 					{
 						GdkPixbuf* _tmp9_ = NULL;
 						Scaling _tmp10_ = {0};
@@ -5704,7 +5715,7 @@ 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 5708 "Photo.c"
+#line 5719 "Photo.c"
 							goto __finally266;
 						}
 #line 685 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5717,7 +5728,7 @@ 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 5721 "Photo.c"
+#line 5732 "Photo.c"
 					}
 					__finally266:
 					{
@@ -5726,7 +5737,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						_tmp13_ = self->priv->readers;
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 5730 "Photo.c"
+#line 5741 "Photo.c"
 					}
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5734,7 +5745,7 @@ 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 5738 "Photo.c"
+#line 5749 "Photo.c"
 						goto __catch265_g_error;
 					}
 				}
@@ -5748,14 +5759,14 @@ 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 5752 "Photo.c"
+#line 5763 "Photo.c"
 					{
 						gboolean _tmp15_ = FALSE;
 #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 5759 "Photo.c"
+#line 5770 "Photo.c"
 							{
 								RawDeveloper _tmp16_ = 0;
 								BackingPhotoRow* _tmp17_ = NULL;
@@ -5767,12 +5778,12 @@ 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 5771 "Photo.c"
+#line 5782 "Photo.c"
 									goto __catch267_g_error;
 								}
 #line 719 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 5776 "Photo.c"
+#line 5787 "Photo.c"
 							}
 							goto __finally267;
 							__catch267_g_error:
@@ -5792,12 +5803,12 @@ 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 5796 "Photo.c"
+#line 5807 "Photo.c"
 							}
 							__finally267:
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5801 "Photo.c"
+#line 5812 "Photo.c"
 								goto __catch265_g_error;
 							}
 						}
@@ -5806,7 +5817,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 5810 "Photo.c"
+#line 5821 "Photo.c"
 				}
 #line 694 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = bps;
@@ -5822,7 +5833,7 @@ 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 5826 "Photo.c"
+#line 5837 "Photo.c"
 					goto __catch265_g_error;
 				}
 #line 695 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5839,7 +5850,7 @@ 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 5843 "Photo.c"
+#line 5854 "Photo.c"
 					goto __catch265_g_error;
 				}
 #line 703 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5856,7 +5867,7 @@ 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 5860 "Photo.c"
+#line 5871 "Photo.c"
 					goto __catch265_g_error;
 				}
 #line 709 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5877,7 +5888,7 @@ 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 5881 "Photo.c"
+#line 5892 "Photo.c"
 					goto __catch265_g_error;
 				}
 #line 710 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5898,7 +5909,7 @@ 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 5902 "Photo.c"
+#line 5913 "Photo.c"
 					goto __catch265_g_error;
 				}
 #line 676 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5911,7 +5922,7 @@ 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 5915 "Photo.c"
+#line 5926 "Photo.c"
 			}
 			goto __finally265;
 			__catch265_g_error:
@@ -5931,7 +5942,7 @@ 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 5935 "Photo.c"
+#line 5946 "Photo.c"
 			}
 			__finally265:
 			{
@@ -5940,7 +5951,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				_tmp33_ = wrote_img_to_disk;
 #line 714 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp33_) {
-#line 5944 "Photo.c"
+#line 5955 "Photo.c"
 					{
 						RawDeveloper _tmp34_ = 0;
 						BackingPhotoRow* _tmp35_ = NULL;
@@ -5952,12 +5963,12 @@ 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 5956 "Photo.c"
+#line 5967 "Photo.c"
 							goto __catch268_g_error;
 						}
 #line 719 "/home/jens/Source/shotwell/src/Photo.vala"
 						photo_notify_raw_development_modified (self);
-#line 5961 "Photo.c"
+#line 5972 "Photo.c"
 					}
 					goto __finally268;
 					__catch268_g_error:
@@ -5977,7 +5988,7 @@ 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 5981 "Photo.c"
+#line 5992 "Photo.c"
 					}
 					__finally268:
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5990,7 +6001,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 5994 "Photo.c"
+#line 6005 "Photo.c"
 					}
 				}
 			}
@@ -6004,23 +6015,23 @@ 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 6008 "Photo.c"
+#line 6019 "Photo.c"
 			}
 #line 727 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 6012 "Photo.c"
+#line 6023 "Photo.c"
 		}
 #line 674 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 6016 "Photo.c"
+#line 6027 "Photo.c"
 		{
 #line 731 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 6020 "Photo.c"
+#line 6031 "Photo.c"
 		}
 #line 674 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 6024 "Photo.c"
+#line 6035 "Photo.c"
 		{
 			{
 				PhotoMetadata* meta = NULL;
@@ -6063,7 +6074,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				meta = _tmp38_;
 #line 736 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6067 "Photo.c"
+#line 6078 "Photo.c"
 					goto __catch269_g_error;
 				}
 #line 737 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6078,14 +6089,14 @@ 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 6082 "Photo.c"
+#line 6093 "Photo.c"
 					{
 						gboolean _tmp42_ = FALSE;
 #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 6089 "Photo.c"
+#line 6100 "Photo.c"
 							{
 								RawDeveloper _tmp43_ = 0;
 								BackingPhotoRow* _tmp44_ = NULL;
@@ -6097,12 +6108,12 @@ 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 6101 "Photo.c"
+#line 6112 "Photo.c"
 									goto __catch270_g_error;
 								}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 6106 "Photo.c"
+#line 6117 "Photo.c"
 							}
 							goto __finally270;
 							__catch270_g_error:
@@ -6122,12 +6133,12 @@ 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 6126 "Photo.c"
+#line 6137 "Photo.c"
 							}
 							__finally270:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6131 "Photo.c"
+#line 6142 "Photo.c"
 								goto __catch269_g_error;
 							}
 						}
@@ -6136,7 +6147,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 6140 "Photo.c"
+#line 6151 "Photo.c"
 				}
 #line 740 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = meta;
@@ -6156,14 +6167,14 @@ 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 6160 "Photo.c"
+#line 6171 "Photo.c"
 					{
 						gboolean _tmp51_ = FALSE;
 #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 6167 "Photo.c"
+#line 6178 "Photo.c"
 							{
 								RawDeveloper _tmp52_ = 0;
 								BackingPhotoRow* _tmp53_ = NULL;
@@ -6175,12 +6186,12 @@ 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 6179 "Photo.c"
+#line 6190 "Photo.c"
 									goto __catch271_g_error;
 								}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 6184 "Photo.c"
+#line 6195 "Photo.c"
 							}
 							goto __finally271;
 							__catch271_g_error:
@@ -6200,12 +6211,12 @@ 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 6204 "Photo.c"
+#line 6215 "Photo.c"
 							}
 							__finally271:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6209 "Photo.c"
+#line 6220 "Photo.c"
 								goto __catch269_g_error;
 							}
 						}
@@ -6214,7 +6225,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 6218 "Photo.c"
+#line 6229 "Photo.c"
 				}
 #line 746 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp56_ = prev;
@@ -6228,7 +6239,7 @@ 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 6232 "Photo.c"
+#line 6243 "Photo.c"
 					goto __catch269_g_error;
 				}
 #line 747 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6243,14 +6254,14 @@ 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 6247 "Photo.c"
+#line 6258 "Photo.c"
 					{
 						gboolean _tmp59_ = FALSE;
 #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 6254 "Photo.c"
+#line 6265 "Photo.c"
 							{
 								RawDeveloper _tmp60_ = 0;
 								BackingPhotoRow* _tmp61_ = NULL;
@@ -6262,12 +6273,12 @@ 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 6266 "Photo.c"
+#line 6277 "Photo.c"
 									goto __catch272_g_error;
 								}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 6271 "Photo.c"
+#line 6282 "Photo.c"
 							}
 							goto __finally272;
 							__catch272_g_error:
@@ -6287,12 +6298,12 @@ 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 6291 "Photo.c"
+#line 6302 "Photo.c"
 							}
 							__finally272:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6296 "Photo.c"
+#line 6307 "Photo.c"
 								goto __catch269_g_error;
 							}
 						}
@@ -6301,7 +6312,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 6305 "Photo.c"
+#line 6316 "Photo.c"
 				}
 #line 753 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp65_ = d;
@@ -6323,7 +6334,7 @@ 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 6327 "Photo.c"
+#line 6338 "Photo.c"
 					goto __catch269_g_error;
 				}
 #line 753 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6352,7 +6363,7 @@ 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 6356 "Photo.c"
+#line 6367 "Photo.c"
 					goto __catch269_g_error;
 				}
 #line 755 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6373,7 +6384,7 @@ 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 6377 "Photo.c"
+#line 6388 "Photo.c"
 					goto __catch269_g_error;
 				}
 #line 759 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6398,7 +6409,7 @@ 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 6402 "Photo.c"
+#line 6413 "Photo.c"
 					goto __catch269_g_error;
 				}
 #line 763 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6421,7 +6432,7 @@ 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 6425 "Photo.c"
+#line 6436 "Photo.c"
 					goto __catch269_g_error;
 				}
 #line 734 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6436,7 +6447,7 @@ 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 6440 "Photo.c"
+#line 6451 "Photo.c"
 			}
 			goto __finally269;
 			__catch269_g_error:
@@ -6456,14 +6467,14 @@ 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 6460 "Photo.c"
+#line 6471 "Photo.c"
 				{
 					gboolean _tmp83_ = FALSE;
 #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 6467 "Photo.c"
+#line 6478 "Photo.c"
 						{
 							RawDeveloper _tmp84_ = 0;
 							BackingPhotoRow* _tmp85_ = NULL;
@@ -6475,12 +6486,12 @@ 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 6479 "Photo.c"
+#line 6490 "Photo.c"
 								goto __catch273_g_error;
 							}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 							photo_notify_raw_development_modified (self);
-#line 6484 "Photo.c"
+#line 6495 "Photo.c"
 						}
 						goto __finally273;
 						__catch273_g_error:
@@ -6500,14 +6511,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 6504 "Photo.c"
+#line 6515 "Photo.c"
 						}
 						__finally273:
 #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 6511 "Photo.c"
+#line 6522 "Photo.c"
 						}
 					}
 				}
@@ -6515,7 +6526,7 @@ 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 6519 "Photo.c"
+#line 6530 "Photo.c"
 			}
 			__finally269:
 			{
@@ -6524,7 +6535,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				_tmp88_ = wrote_img_to_disk;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp88_) {
-#line 6528 "Photo.c"
+#line 6539 "Photo.c"
 					{
 						RawDeveloper _tmp89_ = 0;
 						BackingPhotoRow* _tmp90_ = NULL;
@@ -6536,12 +6547,12 @@ 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 6540 "Photo.c"
+#line 6551 "Photo.c"
 							goto __catch274_g_error;
 						}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 						photo_notify_raw_development_modified (self);
-#line 6545 "Photo.c"
+#line 6556 "Photo.c"
 					}
 					goto __finally274;
 					__catch274_g_error:
@@ -6561,7 +6572,7 @@ 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 6565 "Photo.c"
+#line 6576 "Photo.c"
 					}
 					__finally274:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6574,7 +6585,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 6578 "Photo.c"
+#line 6589 "Photo.c"
 					}
 				}
 			}
@@ -6588,22 +6599,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 6592 "Photo.c"
+#line 6603 "Photo.c"
 			}
 #line 780 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 6596 "Photo.c"
+#line 6607 "Photo.c"
 		}
 		default:
 		{
 #line 783 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_assert_not_reached ();
-#line 6602 "Photo.c"
+#line 6613 "Photo.c"
 		}
 	}
 #line 670 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (bps);
-#line 6607 "Photo.c"
+#line 6618 "Photo.c"
 }
 
 
@@ -6611,14 +6622,14 @@ 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 6615 "Photo.c"
+#line 6626 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 6622 "Photo.c"
+#line 6633 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			RawDeveloper _tmp2_ = 0;
@@ -6628,7 +6639,7 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) {
 			_tmp2_ = d;
 #line 790 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_->developer = _tmp2_;
-#line 6632 "Photo.c"
+#line 6643 "Photo.c"
 		}
 		__finally275:
 		{
@@ -6637,7 +6648,7 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) {
 			_tmp3_ = self->row;
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 6641 "Photo.c"
+#line 6652 "Photo.c"
 		}
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -6647,7 +6658,7 @@ 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 6651 "Photo.c"
+#line 6662 "Photo.c"
 		}
 	}
 }
@@ -6669,29 +6680,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 6673 "Photo.c"
+#line 6684 "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 6679 "Photo.c"
+#line 6690 "Photo.c"
 		RawDeveloper _tmp3_ = 0;
 #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 6685 "Photo.c"
+#line 6696 "Photo.c"
 	} else {
 #line 802 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = FALSE;
-#line 6689 "Photo.c"
+#line 6700 "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 6695 "Photo.c"
+#line 6706 "Photo.c"
 	}
 #line 807 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_EMBEDDED);
@@ -6699,7 +6710,7 @@ 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 6703 "Photo.c"
+#line 6714 "Photo.c"
 	}
 	{
 		GeeHashMap* _tmp5_ = NULL;
@@ -6707,7 +6718,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 		_tmp5_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 6711 "Photo.c"
+#line 6722 "Photo.c"
 		{
 			RawDeveloper stale_raw_developer = 0;
 			PhotoRow* _tmp6_ = NULL;
@@ -6744,13 +6755,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 6748 "Photo.c"
+#line 6759 "Photo.c"
 				RawDeveloper _tmp10_ = 0;
 #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 6754 "Photo.c"
+#line 6765 "Photo.c"
 			}
 #line 817 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = self->priv->developments;
@@ -6760,18 +6771,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 6764 "Photo.c"
+#line 6775 "Photo.c"
 				{
 					GeeHashMap* _tmp14_ = NULL;
 #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 6771 "Photo.c"
+#line 6782 "Photo.c"
 				}
 #line 818 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6775 "Photo.c"
+#line 6786 "Photo.c"
 			}
 #line 821 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_revert_to_master (self, FALSE);
@@ -6807,7 +6818,7 @@ 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 6811 "Photo.c"
+#line 6822 "Photo.c"
 			{
 				GdkPixbuf* _tmp26_ = NULL;
 				GdkPixbuf* _tmp27_ = NULL;
@@ -6819,7 +6830,7 @@ 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 6823 "Photo.c"
+#line 6834 "Photo.c"
 					goto __catch277_g_error;
 				}
 			}
@@ -6833,30 +6844,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 6837 "Photo.c"
+#line 6848 "Photo.c"
 				{
 					GeeHashMap* _tmp28_ = NULL;
 #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 6844 "Photo.c"
+#line 6855 "Photo.c"
 				}
 #line 832 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6848 "Photo.c"
+#line 6859 "Photo.c"
 			}
 			__finally277:
 #line 828 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6853 "Photo.c"
+#line 6864 "Photo.c"
 				{
 					GeeHashMap* _tmp29_ = NULL;
 #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 6860 "Photo.c"
+#line 6871 "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);
@@ -6864,7 +6875,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 6868 "Photo.c"
+#line 6879 "Photo.c"
 			}
 #line 835 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp30_ = self->backing_photo_row;
@@ -6872,7 +6883,7 @@ 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 6876 "Photo.c"
+#line 6887 "Photo.c"
 			{
 				PhotoTable* _tmp32_ = NULL;
 				PhotoTable* _tmp33_ = NULL;
@@ -6898,7 +6909,7 @@ 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 6902 "Photo.c"
+#line 6913 "Photo.c"
 					goto __catch278_g_error;
 				}
 			}
@@ -6920,19 +6931,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 6924 "Photo.c"
+#line 6935 "Photo.c"
 			}
 			__finally278:
 #line 837 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6929 "Photo.c"
+#line 6940 "Photo.c"
 				{
 					GeeHashMap* _tmp40_ = NULL;
 #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 6936 "Photo.c"
+#line 6947 "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);
@@ -6940,13 +6951,13 @@ 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 6944 "Photo.c"
+#line 6955 "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 6950 "Photo.c"
+#line 6961 "Photo.c"
 				RawDeveloper _tmp43_ = 0;
 				PhotoRow* _tmp44_ = NULL;
 				RawDeveloper _tmp45_ = 0;
@@ -6958,21 +6969,21 @@ 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 6962 "Photo.c"
+#line 6973 "Photo.c"
 			} else {
 #line 847 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp41_ = FALSE;
-#line 6966 "Photo.c"
+#line 6977 "Photo.c"
 			}
 #line 847 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp41_) {
-#line 6970 "Photo.c"
+#line 6981 "Photo.c"
 				RawDeveloper _tmp46_ = 0;
 #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 6976 "Photo.c"
+#line 6987 "Photo.c"
 			}
 		}
 		__finally276:
@@ -6982,7 +6993,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 			_tmp47_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6986 "Photo.c"
+#line 6997 "Photo.c"
 		}
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -6992,7 +7003,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 6996 "Photo.c"
+#line 7007 "Photo.c"
 		}
 	}
 #line 858 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7005,7 +7016,7 @@ 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 7009 "Photo.c"
+#line 7020 "Photo.c"
 }
 
 
@@ -7023,7 +7034,7 @@ RawDeveloper photo_get_raw_developer (Photo* self) {
 	result = _tmp1_;
 #line 863 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 7027 "Photo.c"
+#line 7038 "Photo.c"
 }
 
 
@@ -7035,14 +7046,14 @@ 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 7039 "Photo.c"
+#line 7050 "Photo.c"
 	{
 		GeeHashMap* _tmp0_ = NULL;
 #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 7046 "Photo.c"
+#line 7057 "Photo.c"
 		{
 			GeeHashMap* _tmp1_ = NULL;
 			RawDeveloper _tmp2_ = 0;
@@ -7058,9 +7069,9 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 			gpointer _tmp12_ = NULL;
 			BackingPhotoRow* _tmp13_ = NULL;
 			const gchar* _tmp14_ = NULL;
-			GeeHashMap* _tmp37_ = NULL;
-			RawDeveloper _tmp38_ = 0;
-			gboolean _tmp39_ = FALSE;
+			GeeHashMap* _tmp39_ = NULL;
+			RawDeveloper _tmp40_ = 0;
+			gboolean _tmp41_ = FALSE;
 #line 872 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->developments;
 #line 872 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7071,18 +7082,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 7075 "Photo.c"
+#line 7086 "Photo.c"
 				{
 					GeeHashMap* _tmp4_ = NULL;
 #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 7082 "Photo.c"
+#line 7093 "Photo.c"
 				}
 #line 873 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7086 "Photo.c"
+#line 7097 "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));
@@ -7114,7 +7125,7 @@ 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 7118 "Photo.c"
+#line 7129 "Photo.c"
 				GFile* f = NULL;
 				BackingPhotoRow* _tmp15_ = NULL;
 				const gchar* _tmp16_ = NULL;
@@ -7127,14 +7138,14 @@ 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 7131 "Photo.c"
+#line 7142 "Photo.c"
 				{
 					RawDeveloper _tmp18_ = 0;
 #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 7138 "Photo.c"
+#line 7149 "Photo.c"
 						GFile* _tmp19_ = NULL;
 #line 883 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp19_ = f;
@@ -7142,7 +7153,7 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 						g_file_trash (_tmp19_, NULL, &_inner_error_);
 #line 883 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7146 "Photo.c"
+#line 7157 "Photo.c"
 							goto __catch280_g_error;
 						}
 					} else {
@@ -7153,7 +7164,7 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 						g_file_delete (_tmp20_, NULL, &_inner_error_);
 #line 885 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7157 "Photo.c"
+#line 7168 "Photo.c"
 							goto __catch280_g_error;
 						}
 					}
@@ -7182,11 +7193,13 @@ 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 7186 "Photo.c"
+#line 7197 "Photo.c"
 				}
 				__finally280:
 #line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 7202 "Photo.c"
+					gboolean _tmp26_ = FALSE;
 #line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (f);
 #line 881 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7195,68 +7208,68 @@ 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 7199 "Photo.c"
+#line 7212 "Photo.c"
 					{
 						GeeHashMap* _tmp25_ = NULL;
 #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 7206 "Photo.c"
+#line 7219 "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);
 #line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_clear_error (&_inner_error_);
 #line 881 "/home/jens/Source/shotwell/src/Photo.vala"
-					return FALSE;
-#line 7214 "Photo.c"
+					return _tmp26_;
+#line 7227 "Photo.c"
 				}
 #line 879 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (f);
-#line 7218 "Photo.c"
+#line 7231 "Photo.c"
 			}
 			{
-				PhotoTable* _tmp26_ = NULL;
 				PhotoTable* _tmp27_ = NULL;
-				PhotoRow* _tmp28_ = NULL;
-				RawDeveloper _tmp29_ = 0;
-				BackingPhotoTable* _tmp30_ = NULL;
+				PhotoTable* _tmp28_ = NULL;
+				PhotoRow* _tmp29_ = NULL;
+				RawDeveloper _tmp30_ = 0;
 				BackingPhotoTable* _tmp31_ = NULL;
-				BackingPhotoRow* _tmp32_ = NULL;
-				BackingPhotoID _tmp33_ = {0};
+				BackingPhotoTable* _tmp32_ = NULL;
+				BackingPhotoRow* _tmp33_ = NULL;
+				BackingPhotoID _tmp34_ = {0};
 #line 893 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp26_ = photo_table_get_instance ();
+				_tmp27_ = photo_table_get_instance ();
 #line 893 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp27_ = _tmp26_;
+				_tmp28_ = _tmp27_;
 #line 893 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp28_ = self->row;
+				_tmp29_ = self->row;
 #line 893 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp29_ = d;
+				_tmp30_ = d;
 #line 893 "/home/jens/Source/shotwell/src/Photo.vala"
-				photo_table_remove_development (_tmp27_, _tmp28_, _tmp29_, &_inner_error_);
+				photo_table_remove_development (_tmp28_, _tmp29_, _tmp30_, &_inner_error_);
 #line 893 "/home/jens/Source/shotwell/src/Photo.vala"
-				_database_table_unref0 (_tmp27_);
+				_database_table_unref0 (_tmp28_);
 #line 893 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7243 "Photo.c"
+#line 7256 "Photo.c"
 					goto __catch281_g_error;
 				}
 #line 894 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp30_ = backing_photo_table_get_instance ();
+				_tmp31_ = backing_photo_table_get_instance ();
 #line 894 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp31_ = _tmp30_;
+				_tmp32_ = _tmp31_;
 #line 894 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp32_ = bpr;
+				_tmp33_ = bpr;
 #line 894 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp33_ = _tmp32_->id;
+				_tmp34_ = _tmp33_->id;
 #line 894 "/home/jens/Source/shotwell/src/Photo.vala"
-				backing_photo_table_remove (_tmp31_, &_tmp33_, &_inner_error_);
+				backing_photo_table_remove (_tmp32_, &_tmp34_, &_inner_error_);
 #line 894 "/home/jens/Source/shotwell/src/Photo.vala"
-				_database_table_unref0 (_tmp31_);
+				_database_table_unref0 (_tmp32_);
 #line 894 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7260 "Photo.c"
+#line 7273 "Photo.c"
 					goto __catch281_g_error;
 				}
 			}
@@ -7264,76 +7277,80 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 			__catch281_g_error:
 			{
 				GError* e = NULL;
-				GError* _tmp34_ = NULL;
-				const gchar* _tmp35_ = NULL;
+				GError* _tmp35_ = NULL;
+				const gchar* _tmp36_ = NULL;
 #line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				e = _inner_error_;
 #line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_inner_error_ = NULL;
 #line 896 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp34_ = e;
+				_tmp35_ = e;
 #line 896 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp35_ = _tmp34_->message;
+				_tmp36_ = _tmp35_->message;
 #line 896 "/home/jens/Source/shotwell/src/Photo.vala"
-				g_warning ("Photo.vala:896: Database error while deleting RAW development: %s", _tmp35_);
+				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 7282 "Photo.c"
+#line 7295 "Photo.c"
 			}
 			__finally281:
 #line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 7300 "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 7291 "Photo.c"
+#line 7306 "Photo.c"
 				{
-					GeeHashMap* _tmp36_ = NULL;
+					GeeHashMap* _tmp37_ = NULL;
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp36_ = self->priv->developments;
+					_tmp37_ = self->priv->developments;
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7298 "Photo.c"
+#line 7313 "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);
 #line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
 #line 892 "/home/jens/Source/shotwell/src/Photo.vala"
-				return FALSE;
-#line 7306 "Photo.c"
+				return _tmp38_;
+#line 7321 "Photo.c"
 			}
 #line 899 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp37_ = self->priv->developments;
+			_tmp39_ = self->priv->developments;
 #line 899 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp38_ = d;
+			_tmp40_ = d;
 #line 899 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp39_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp38_), NULL);
+			_tmp41_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp40_), NULL);
 #line 899 "/home/jens/Source/shotwell/src/Photo.vala"
-			ret = _tmp39_;
+			ret = _tmp41_;
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (bpr);
-#line 7318 "Photo.c"
+#line 7333 "Photo.c"
 		}
 		__finally279:
 		{
-			GeeHashMap* _tmp40_ = NULL;
+			GeeHashMap* _tmp42_ = NULL;
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp40_ = self->priv->developments;
+			_tmp42_ = self->priv->developments;
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7327 "Photo.c"
+#line 7342 "Photo.c"
 		}
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 7346 "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);
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
 #line 871 "/home/jens/Source/shotwell/src/Photo.vala"
-			return FALSE;
-#line 7337 "Photo.c"
+			return _tmp43_;
+#line 7354 "Photo.c"
 		}
 	}
 #line 902 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7342,7 +7359,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 7346 "Photo.c"
+#line 7363 "Photo.c"
 }
 
 
@@ -7350,14 +7367,14 @@ 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 7354 "Photo.c"
+#line 7371 "Photo.c"
 	{
 		GeeHashMap* _tmp0_ = NULL;
 #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 7361 "Photo.c"
+#line 7378 "Photo.c"
 		{
 			RawDeveloper _tmp1_ = 0;
 			RawDeveloper dev = 0;
@@ -7378,13 +7395,13 @@ 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 7382 "Photo.c"
+#line 7399 "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 7388 "Photo.c"
+#line 7405 "Photo.c"
 		}
 		__finally282:
 		{
@@ -7393,7 +7410,7 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d) {
 			_tmp5_ = self->priv->developments;
 #line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7397 "Photo.c"
+#line 7414 "Photo.c"
 		}
 #line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -7403,7 +7420,7 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d) {
 			g_clear_error (&_inner_error_);
 #line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 7407 "Photo.c"
+#line 7424 "Photo.c"
 		}
 	}
 }
@@ -7416,13 +7433,13 @@ static void _vala_array_add85 (BackingFileState*** array, int* length, int* size
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (BackingFileState*, *array, (*size) + 1);
-#line 7420 "Photo.c"
+#line 7437 "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 7426 "Photo.c"
+#line 7443 "Photo.c"
 }
 
 
@@ -7433,13 +7450,13 @@ static void _vala_array_add86 (BackingFileState*** array, int* length, int* size
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (BackingFileState*, *array, (*size) + 1);
-#line 7437 "Photo.c"
+#line 7454 "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 7443 "Photo.c"
+#line 7460 "Photo.c"
 }
 
 
@@ -7450,13 +7467,13 @@ static void _vala_array_add87 (BackingFileState*** array, int* length, int* size
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (BackingFileState*, *array, (*size) + 1);
-#line 7454 "Photo.c"
+#line 7471 "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 7460 "Photo.c"
+#line 7477 "Photo.c"
 }
 
 
@@ -7480,14 +7497,14 @@ 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 7484 "Photo.c"
+#line 7501 "Photo.c"
 	{
 		PhotoRow* _tmp1_ = NULL;
 #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 7491 "Photo.c"
+#line 7508 "Photo.c"
 		{
 			BackingFileState** _tmp2_ = NULL;
 			gint _tmp2__length1 = 0;
@@ -7518,7 +7535,7 @@ 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 7522 "Photo.c"
+#line 7539 "Photo.c"
 				BackingFileState** _tmp9_ = NULL;
 				gint _tmp9__length1 = 0;
 				BackingPhotoRow* _tmp10_ = NULL;
@@ -7533,13 +7550,13 @@ 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 7537 "Photo.c"
+#line 7554 "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 7543 "Photo.c"
+#line 7560 "Photo.c"
 				GeeCollection* dev_rows = NULL;
 				GeeCollection* _tmp13_ = NULL;
 				GeeCollection* _tmp14_ = NULL;
@@ -7551,7 +7568,7 @@ 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 7555 "Photo.c"
+#line 7572 "Photo.c"
 					{
 						GeeIterator* _r_it = NULL;
 						GeeCollection* _tmp15_ = NULL;
@@ -7564,7 +7581,7 @@ 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 7568 "Photo.c"
+#line 7585 "Photo.c"
 							GeeIterator* _tmp17_ = NULL;
 							gboolean _tmp18_ = FALSE;
 							BackingPhotoRow* r = NULL;
@@ -7584,7 +7601,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 							if (!_tmp18_) {
 #line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 7588 "Photo.c"
+#line 7605 "Photo.c"
 							}
 #line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp19_ = _r_it;
@@ -7610,16 +7627,16 @@ 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 7614 "Photo.c"
+#line 7631 "Photo.c"
 						}
 #line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_r_it);
-#line 7618 "Photo.c"
+#line 7635 "Photo.c"
 					}
 				}
 #line 925 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (dev_rows);
-#line 7623 "Photo.c"
+#line 7640 "Photo.c"
 			}
 		}
 		__finally283:
@@ -7629,7 +7646,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 			_tmp26_ = self->row;
 #line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 7633 "Photo.c"
+#line 7650 "Photo.c"
 		}
 #line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -7641,7 +7658,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 7645 "Photo.c"
+#line 7662 "Photo.c"
 		}
 	}
 #line 936 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7652,13 +7669,13 @@ 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 7656 "Photo.c"
+#line 7673 "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 7662 "Photo.c"
+#line 7679 "Photo.c"
 }
 
 
@@ -7673,7 +7690,7 @@ 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 7677 "Photo.c"
+#line 7694 "Photo.c"
 		{
 			PhotoFileReader* _tmp1_ = NULL;
 #line 942 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7682,11 +7699,11 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode
 			result = _tmp1_;
 #line 942 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7686 "Photo.c"
+#line 7703 "Photo.c"
 		}
 #line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_BASELINE:
-#line 7690 "Photo.c"
+#line 7707 "Photo.c"
 		{
 			PhotoFileReader* _tmp2_ = NULL;
 #line 945 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7695,11 +7712,11 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode
 			result = _tmp2_;
 #line 945 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7699 "Photo.c"
+#line 7716 "Photo.c"
 		}
 #line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_SOURCE:
-#line 7703 "Photo.c"
+#line 7720 "Photo.c"
 		{
 			PhotoFileReader* _tmp3_ = NULL;
 #line 948 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7708,18 +7725,18 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode
 			result = _tmp3_;
 #line 948 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7712 "Photo.c"
+#line 7729 "Photo.c"
 		}
 #line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_UNMODIFIED:
-#line 7716 "Photo.c"
+#line 7733 "Photo.c"
 		{
 			PhotoFileFormat _tmp4_ = 0;
 #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 7723 "Photo.c"
+#line 7740 "Photo.c"
 				PhotoFileReader* _tmp5_ = NULL;
 #line 952 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = photo_get_raw_developer_reader (self);
@@ -7727,7 +7744,7 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode
 				result = _tmp5_;
 #line 952 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7731 "Photo.c"
+#line 7748 "Photo.c"
 			} else {
 				PhotoFileReader* _tmp6_ = NULL;
 #line 954 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7736,7 +7753,7 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode
 				result = _tmp6_;
 #line 954 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7740 "Photo.c"
+#line 7757 "Photo.c"
 			}
 		}
 		default:
@@ -7749,7 +7766,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 7753 "Photo.c"
+#line 7770 "Photo.c"
 		}
 	}
 }
@@ -7758,7 +7775,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 7762 "Photo.c"
+#line 7779 "Photo.c"
 }
 
 
@@ -7767,14 +7784,14 @@ 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 7771 "Photo.c"
+#line 7788 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #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 7778 "Photo.c"
+#line 7795 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -7787,18 +7804,18 @@ 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 7791 "Photo.c"
+#line 7808 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp4_ = NULL;
 #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 7798 "Photo.c"
+#line 7815 "Photo.c"
 			}
 #line 963 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7802 "Photo.c"
+#line 7819 "Photo.c"
 		}
 		__finally284:
 		{
@@ -7807,7 +7824,7 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) {
 			_tmp5_ = self->priv->readers;
 #line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7811 "Photo.c"
+#line 7828 "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);
@@ -7815,7 +7832,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 7819 "Photo.c"
+#line 7836 "Photo.c"
 	}
 }
 
@@ -7825,14 +7842,14 @@ 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 7829 "Photo.c"
+#line 7846 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #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 7836 "Photo.c"
+#line 7853 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -7845,18 +7862,18 @@ 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 7849 "Photo.c"
+#line 7866 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp4_ = NULL;
 #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 7856 "Photo.c"
+#line 7873 "Photo.c"
 			}
 #line 969 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7860 "Photo.c"
+#line 7877 "Photo.c"
 		}
 		__finally285:
 		{
@@ -7865,7 +7882,7 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) {
 			_tmp5_ = self->priv->readers;
 #line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7869 "Photo.c"
+#line 7886 "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);
@@ -7873,7 +7890,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 7877 "Photo.c"
+#line 7894 "Photo.c"
 	}
 }
 
@@ -7883,14 +7900,14 @@ 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 7887 "Photo.c"
+#line 7904 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #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 7894 "Photo.c"
+#line 7911 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -7905,7 +7922,7 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 			_tmp2_ = _tmp1_->editable;
 #line 976 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 7909 "Photo.c"
+#line 7926 "Photo.c"
 				PhotoBackingReaders* _tmp3_ = NULL;
 				PhotoFileReader* _tmp4_ = NULL;
 				PhotoFileReader* _tmp5_ = NULL;
@@ -7917,18 +7934,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 7921 "Photo.c"
+#line 7938 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp6_ = NULL;
 #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 7928 "Photo.c"
+#line 7945 "Photo.c"
 				}
 #line 977 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7932 "Photo.c"
+#line 7949 "Photo.c"
 			}
 #line 979 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->priv->readers;
@@ -7936,7 +7953,7 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 			_tmp8_ = _tmp7_->developer;
 #line 979 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_ != NULL) {
-#line 7940 "Photo.c"
+#line 7957 "Photo.c"
 				PhotoBackingReaders* _tmp9_ = NULL;
 				PhotoFileReader* _tmp10_ = NULL;
 				PhotoFileReader* _tmp11_ = NULL;
@@ -7948,18 +7965,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 7952 "Photo.c"
+#line 7969 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp12_ = NULL;
 #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 7959 "Photo.c"
+#line 7976 "Photo.c"
 				}
 #line 980 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7963 "Photo.c"
+#line 7980 "Photo.c"
 			}
 #line 982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = self->priv->readers;
@@ -7969,18 +7986,18 @@ 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 7973 "Photo.c"
+#line 7990 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp16_ = NULL;
 #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 7980 "Photo.c"
+#line 7997 "Photo.c"
 			}
 #line 982 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7984 "Photo.c"
+#line 8001 "Photo.c"
 		}
 		__finally286:
 		{
@@ -7989,7 +8006,7 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 			_tmp17_ = self->priv->readers;
 #line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7993 "Photo.c"
+#line 8010 "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);
@@ -7997,7 +8014,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 8001 "Photo.c"
+#line 8018 "Photo.c"
 	}
 }
 
@@ -8007,14 +8024,14 @@ 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 8011 "Photo.c"
+#line 8028 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #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 8018 "Photo.c"
+#line 8035 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -8029,7 +8046,7 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 			_tmp2_ = _tmp1_->editable;
 #line 989 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 8033 "Photo.c"
+#line 8050 "Photo.c"
 				PhotoBackingReaders* _tmp3_ = NULL;
 				PhotoFileReader* _tmp4_ = NULL;
 				PhotoFileReader* _tmp5_ = NULL;
@@ -8041,18 +8058,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 8045 "Photo.c"
+#line 8062 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp6_ = NULL;
 #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 8052 "Photo.c"
+#line 8069 "Photo.c"
 				}
 #line 990 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8056 "Photo.c"
+#line 8073 "Photo.c"
 			}
 #line 992 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->priv->readers;
@@ -8060,7 +8077,7 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 			_tmp8_ = _tmp7_->developer;
 #line 992 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_ != NULL) {
-#line 8064 "Photo.c"
+#line 8081 "Photo.c"
 				PhotoBackingReaders* _tmp9_ = NULL;
 				PhotoFileReader* _tmp10_ = NULL;
 				PhotoFileReader* _tmp11_ = NULL;
@@ -8072,18 +8089,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 8076 "Photo.c"
+#line 8093 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp12_ = NULL;
 #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 8083 "Photo.c"
+#line 8100 "Photo.c"
 				}
 #line 993 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8087 "Photo.c"
+#line 8104 "Photo.c"
 			}
 #line 995 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = self->priv->readers;
@@ -8093,18 +8110,18 @@ 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 8097 "Photo.c"
+#line 8114 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp16_ = NULL;
 #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 8104 "Photo.c"
+#line 8121 "Photo.c"
 			}
 #line 995 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8108 "Photo.c"
+#line 8125 "Photo.c"
 		}
 		__finally287:
 		{
@@ -8113,7 +8130,7 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 			_tmp17_ = self->priv->readers;
 #line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8117 "Photo.c"
+#line 8134 "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);
@@ -8121,7 +8138,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 8125 "Photo.c"
+#line 8142 "Photo.c"
 	}
 }
 
@@ -8131,14 +8148,14 @@ 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 8135 "Photo.c"
+#line 8152 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #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 8142 "Photo.c"
+#line 8159 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -8151,18 +8168,18 @@ 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 8155 "Photo.c"
+#line 8172 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp4_ = NULL;
 #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 8162 "Photo.c"
+#line 8179 "Photo.c"
 			}
 #line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8166 "Photo.c"
+#line 8183 "Photo.c"
 		}
 		__finally288:
 		{
@@ -8171,7 +8188,7 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) {
 			_tmp5_ = self->priv->readers;
 #line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8175 "Photo.c"
+#line 8192 "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);
@@ -8179,7 +8196,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 8183 "Photo.c"
+#line 8200 "Photo.c"
 	}
 }
 
@@ -8189,14 +8206,15 @@ 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 8193 "Photo.c"
+#line 8210 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
+		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 8200 "Photo.c"
+#line 8218 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -8206,18 +8224,18 @@ gboolean photo_is_developed (Photo* self) {
 			_tmp2_ = _tmp1_->developer;
 #line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ != NULL;
-#line 8210 "Photo.c"
+#line 8228 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp3_ = NULL;
 #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 8217 "Photo.c"
+#line 8235 "Photo.c"
 			}
 #line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8221 "Photo.c"
+#line 8239 "Photo.c"
 		}
 		__finally289:
 		{
@@ -8226,15 +8244,15 @@ gboolean photo_is_developed (Photo* self) {
 			_tmp4_ = self->priv->readers;
 #line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8230 "Photo.c"
+#line 8248 "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);
 #line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 8238 "Photo.c"
+		return _tmp5_;
+#line 8256 "Photo.c"
 	}
 }
 
@@ -8244,14 +8262,15 @@ 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 8248 "Photo.c"
+#line 8266 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
+		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 8255 "Photo.c"
+#line 8274 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -8261,18 +8280,18 @@ gboolean photo_has_editable (Photo* self) {
 			_tmp2_ = _tmp1_->editable;
 #line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ != NULL;
-#line 8265 "Photo.c"
+#line 8284 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp3_ = NULL;
 #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 8272 "Photo.c"
+#line 8291 "Photo.c"
 			}
 #line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8276 "Photo.c"
+#line 8295 "Photo.c"
 		}
 		__finally290:
 		{
@@ -8281,15 +8300,15 @@ gboolean photo_has_editable (Photo* self) {
 			_tmp4_ = self->priv->readers;
 #line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8285 "Photo.c"
+#line 8304 "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);
 #line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 8293 "Photo.c"
+		return _tmp5_;
+#line 8312 "Photo.c"
 	}
 }
 
@@ -8299,14 +8318,15 @@ 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 8303 "Photo.c"
+#line 8322 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
+		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 8310 "Photo.c"
+#line 8330 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -8319,18 +8339,18 @@ 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 8323 "Photo.c"
+#line 8343 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp4_ = NULL;
 #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 8330 "Photo.c"
+#line 8350 "Photo.c"
 			}
 #line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8334 "Photo.c"
+#line 8354 "Photo.c"
 		}
 		__finally291:
 		{
@@ -8339,15 +8359,15 @@ gboolean photo_does_master_exist (Photo* self) {
 			_tmp5_ = self->priv->readers;
 #line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8343 "Photo.c"
+#line 8363 "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);
 #line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 8351 "Photo.c"
+		return _tmp6_;
+#line 8371 "Photo.c"
 	}
 }
 
@@ -8357,14 +8377,15 @@ 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 8361 "Photo.c"
+#line 8381 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
+		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 8368 "Photo.c"
+#line 8389 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			PhotoBackingReaders* _tmp2_ = NULL;
@@ -8375,7 +8396,7 @@ gboolean photo_does_editable_exist (Photo* self) {
 			_tmp3_ = _tmp2_->editable;
 #line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ != NULL) {
-#line 8379 "Photo.c"
+#line 8400 "Photo.c"
 				PhotoBackingReaders* _tmp4_ = NULL;
 				PhotoFileReader* _tmp5_ = NULL;
 				gboolean _tmp6_ = FALSE;
@@ -8387,26 +8408,26 @@ 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 8391 "Photo.c"
+#line 8412 "Photo.c"
 			} else {
 #line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 8395 "Photo.c"
+#line 8416 "Photo.c"
 			}
 #line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 8399 "Photo.c"
+#line 8420 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp7_ = NULL;
 #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 8406 "Photo.c"
+#line 8427 "Photo.c"
 			}
 #line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8410 "Photo.c"
+#line 8431 "Photo.c"
 		}
 		__finally292:
 		{
@@ -8415,15 +8436,15 @@ gboolean photo_does_editable_exist (Photo* self) {
 			_tmp8_ = self->priv->readers;
 #line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8419 "Photo.c"
+#line 8440 "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);
 #line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 8427 "Photo.c"
+		return _tmp9_;
+#line 8448 "Photo.c"
 	}
 }
 
@@ -8433,14 +8454,15 @@ 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 8437 "Photo.c"
+#line 8458 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
+		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 8444 "Photo.c"
+#line 8466 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -8450,18 +8472,18 @@ gboolean photo_is_master_baseline (Photo* self) {
 			_tmp2_ = _tmp1_->editable;
 #line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ == NULL;
-#line 8454 "Photo.c"
+#line 8476 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp3_ = NULL;
 #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 8461 "Photo.c"
+#line 8483 "Photo.c"
 			}
 #line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8465 "Photo.c"
+#line 8487 "Photo.c"
 		}
 		__finally293:
 		{
@@ -8470,15 +8492,15 @@ gboolean photo_is_master_baseline (Photo* self) {
 			_tmp4_ = self->priv->readers;
 #line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8474 "Photo.c"
+#line 8496 "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);
 #line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 8482 "Photo.c"
+		return _tmp5_;
+#line 8504 "Photo.c"
 	}
 }
 
@@ -8494,7 +8516,7 @@ gboolean photo_is_master_source (Photo* self) {
 	result = !_tmp0_;
 #line 1038 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 8498 "Photo.c"
+#line 8520 "Photo.c"
 }
 
 
@@ -8503,14 +8525,15 @@ 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 8507 "Photo.c"
+#line 8529 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
+		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 8514 "Photo.c"
+#line 8537 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -8520,18 +8543,18 @@ gboolean photo_is_editable_baseline (Photo* self) {
 			_tmp2_ = _tmp1_->editable;
 #line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ != NULL;
-#line 8524 "Photo.c"
+#line 8547 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp3_ = NULL;
 #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 8531 "Photo.c"
+#line 8554 "Photo.c"
 			}
 #line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8535 "Photo.c"
+#line 8558 "Photo.c"
 		}
 		__finally294:
 		{
@@ -8540,15 +8563,15 @@ gboolean photo_is_editable_baseline (Photo* self) {
 			_tmp4_ = self->priv->readers;
 #line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8544 "Photo.c"
+#line 8567 "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);
 #line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 8552 "Photo.c"
+		return _tmp5_;
+#line 8575 "Photo.c"
 	}
 }
 
@@ -8564,7 +8587,7 @@ gboolean photo_is_editable_source (Photo* self) {
 	result = _tmp0_;
 #line 1048 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 8568 "Photo.c"
+#line 8591 "Photo.c"
 }
 
 
@@ -8573,14 +8596,14 @@ 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 8577 "Photo.c"
+#line 8600 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 8584 "Photo.c"
+#line 8607 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			BackingPhotoRow* _tmp2_ = NULL;
@@ -8593,18 +8616,18 @@ 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 8597 "Photo.c"
+#line 8620 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
 #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 8604 "Photo.c"
+#line 8627 "Photo.c"
 			}
 #line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8608 "Photo.c"
+#line 8631 "Photo.c"
 		}
 		__finally295:
 		{
@@ -8613,7 +8636,7 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) {
 			_tmp5_ = self->row;
 #line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8617 "Photo.c"
+#line 8640 "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);
@@ -8621,7 +8644,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 8625 "Photo.c"
+#line 8648 "Photo.c"
 	}
 }
 
@@ -8631,14 +8654,14 @@ 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 8635 "Photo.c"
+#line 8658 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 8642 "Photo.c"
+#line 8665 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
@@ -8648,7 +8671,7 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) {
 			_tmp2_ = backing_photo_id_is_valid (&_tmp1_->editable_id);
 #line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_) {
-#line 8652 "Photo.c"
+#line 8675 "Photo.c"
 				BackingPhotoRow* _tmp3_ = NULL;
 				BackingPhotoRow* _tmp4_ = NULL;
 #line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8657,33 +8680,33 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) {
 				_tmp4_ = _backing_photo_row_ref0 (_tmp3_);
 #line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp4_;
-#line 8661 "Photo.c"
+#line 8684 "Photo.c"
 				{
 					PhotoRow* _tmp5_ = NULL;
 #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 8668 "Photo.c"
+#line 8691 "Photo.c"
 				}
 #line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8672 "Photo.c"
+#line 8695 "Photo.c"
 			} else {
 #line 1063 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = NULL;
-#line 8676 "Photo.c"
+#line 8699 "Photo.c"
 				{
 					PhotoRow* _tmp6_ = NULL;
 #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 8683 "Photo.c"
+#line 8706 "Photo.c"
 				}
 #line 1063 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8687 "Photo.c"
+#line 8710 "Photo.c"
 			}
 		}
 		__finally296:
@@ -8693,7 +8716,7 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) {
 			_tmp7_ = self->row;
 #line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8697 "Photo.c"
+#line 8720 "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);
@@ -8701,7 +8724,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 8705 "Photo.c"
+#line 8728 "Photo.c"
 	}
 }
 
@@ -8711,14 +8734,14 @@ 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 8715 "Photo.c"
+#line 8738 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 8722 "Photo.c"
+#line 8745 "Photo.c"
 		{
 			GeeCollection* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_ = NULL;
@@ -8726,42 +8749,42 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) {
 			_tmp2_ = self->priv->developments;
 #line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 8730 "Photo.c"
+#line 8753 "Photo.c"
 				GeeHashMap* _tmp3_ = NULL;
 				GeeCollection* _tmp4_ = NULL;
 				GeeCollection* _tmp5_ = NULL;
 #line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->developments;
 #line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MAP, GeeMap));
+				_tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_;
 #line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp1_);
 #line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp5_;
-#line 8744 "Photo.c"
+#line 8767 "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 8750 "Photo.c"
+#line 8773 "Photo.c"
 			}
 #line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 8754 "Photo.c"
+#line 8777 "Photo.c"
 			{
 				PhotoRow* _tmp6_ = NULL;
 #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 8761 "Photo.c"
+#line 8784 "Photo.c"
 			}
 #line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8765 "Photo.c"
+#line 8788 "Photo.c"
 		}
 		__finally297:
 		{
@@ -8770,7 +8793,7 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) {
 			_tmp7_ = self->row;
 #line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8774 "Photo.c"
+#line 8797 "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);
@@ -8778,7 +8801,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 8782 "Photo.c"
+#line 8805 "Photo.c"
 	}
 }
 
@@ -8788,14 +8811,14 @@ 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 8792 "Photo.c"
+#line 8815 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 8799 "Photo.c"
+#line 8822 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_ = NULL;
@@ -8803,7 +8826,7 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper
 			_tmp2_ = self->priv->developments;
 #line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 8807 "Photo.c"
+#line 8830 "Photo.c"
 				GeeHashMap* _tmp3_ = NULL;
 				RawDeveloper _tmp4_ = 0;
 				gpointer _tmp5_ = NULL;
@@ -8817,28 +8840,28 @@ 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 8821 "Photo.c"
+#line 8844 "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 8827 "Photo.c"
+#line 8850 "Photo.c"
 			}
 #line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 8831 "Photo.c"
+#line 8854 "Photo.c"
 			{
 				PhotoRow* _tmp6_ = NULL;
 #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 8838 "Photo.c"
+#line 8861 "Photo.c"
 			}
 #line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8842 "Photo.c"
+#line 8865 "Photo.c"
 		}
 		__finally298:
 		{
@@ -8847,7 +8870,7 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper
 			_tmp7_ = self->row;
 #line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8851 "Photo.c"
+#line 8874 "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);
@@ -8855,7 +8878,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 8859 "Photo.c"
+#line 8882 "Photo.c"
 	}
 }
 
@@ -8868,14 +8891,14 @@ 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 8872 "Photo.c"
+#line 8895 "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 8879 "Photo.c"
+#line 8902 "Photo.c"
 }
 
 
@@ -8903,7 +8926,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 8907 "Photo.c"
+#line 8930 "Photo.c"
 	}
 #line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = reader;
@@ -8917,7 +8940,7 @@ 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 8921 "Photo.c"
+#line 8944 "Photo.c"
 }
 
 
@@ -8943,7 +8966,7 @@ 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 8947 "Photo.c"
+#line 8970 "Photo.c"
 		{
 			PhotoFileFormat _tmp3_ = 0;
 #line 1093 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8952,11 +8975,11 @@ PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportForma
 			_result_ = _tmp3_;
 #line 1094 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 8956 "Photo.c"
+#line 8979 "Photo.c"
 		}
 #line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_CURRENT:
-#line 8960 "Photo.c"
+#line 8983 "Photo.c"
 		{
 			PhotoFileFormat _tmp4_ = 0;
 #line 1097 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8965,11 +8988,11 @@ PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportForma
 			_result_ = _tmp4_;
 #line 1098 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 8969 "Photo.c"
+#line 8992 "Photo.c"
 		}
 #line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_SPECIFIED:
-#line 8973 "Photo.c"
+#line 8996 "Photo.c"
 		{
 			ExportFormatParameters _tmp5_ = {0};
 			PhotoFileFormat _tmp6_ = 0;
@@ -8981,21 +9004,21 @@ PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportForma
 			_result_ = _tmp6_;
 #line 1102 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 8985 "Photo.c"
+#line 9008 "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 8991 "Photo.c"
+#line 9014 "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 8998 "Photo.c"
+#line 9021 "Photo.c"
 }
 
 
@@ -9019,7 +9042,7 @@ 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 9022 "Photo.c"
+#line 9045 "Photo.c"
 		{
 			GFile* _tmp2_ = NULL;
 			GFile* _tmp3_ = NULL;
@@ -9038,13 +9061,13 @@ 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 9041 "Photo.c"
+#line 9064 "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 9047 "Photo.c"
+#line 9070 "Photo.c"
 		{
 			ExportFormatParameters _tmp5_ = {0};
 			PhotoFileFormat _tmp6_ = 0;
@@ -9061,14 +9084,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 9064 "Photo.c"
+#line 9087 "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 9070 "Photo.c"
+#line 9093 "Photo.c"
 		}
 	}
 #line 1127 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9079,7 +9102,7 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame
 	result = _result_;
 #line 1128 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 9081 "Photo.c"
+#line 9104 "Photo.c"
 }
 
 
@@ -9220,7 +9243,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	file = _tmp2_;
 #line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
 	info = NULL;
-#line 9222 "Photo.c"
+#line 9245 "Photo.c"
 	{
 		GFileInfo* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
@@ -9234,7 +9257,7 @@ 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 9236 "Photo.c"
+#line 9259 "Photo.c"
 			goto __catch299_g_error;
 		}
 #line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9247,7 +9270,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		info = _tmp6_;
 #line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 9249 "Photo.c"
+#line 9272 "Photo.c"
 	}
 	goto __finally299;
 	__catch299_g_error:
@@ -9267,7 +9290,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1154 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9269 "Photo.c"
+#line 9292 "Photo.c"
 	}
 	__finally299:
 #line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9282,7 +9305,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 9284 "Photo.c"
+#line 9307 "Photo.c"
 	}
 #line 1157 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = info;
@@ -9298,7 +9321,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1158 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9300 "Photo.c"
+#line 9323 "Photo.c"
 	}
 #line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = file;
@@ -9306,7 +9329,7 @@ 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 9308 "Photo.c"
+#line 9331 "Photo.c"
 		GFile* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
@@ -9328,7 +9351,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1163 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9330 "Photo.c"
+#line 9353 "Photo.c"
 	}
 #line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = file;
@@ -9336,7 +9359,7 @@ 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 9338 "Photo.c"
+#line 9361 "Photo.c"
 		GFile* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
 		gchar* _tmp18_ = NULL;
@@ -9358,7 +9381,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9360 "Photo.c"
+#line 9383 "Photo.c"
 	}
 #line 1172 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = info;
@@ -9372,7 +9395,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	_tmp24_ = _tmp23_->exif_md5;
 #line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp24_ != NULL) {
-#line 9374 "Photo.c"
+#line 9397 "Photo.c"
 		PhotoImportParams* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
 #line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9381,15 +9404,15 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_tmp26_ = _tmp25_->thumbnail_md5;
 #line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = _tmp26_ != NULL;
-#line 9383 "Photo.c"
+#line 9406 "Photo.c"
 	} else {
 #line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = FALSE;
-#line 9387 "Photo.c"
+#line 9410 "Photo.c"
 	}
 #line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_) {
-#line 9391 "Photo.c"
+#line 9414 "Photo.c"
 		PhotoImportParams* _tmp27_ = NULL;
 		const gchar* _tmp28_ = NULL;
 #line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9398,15 +9421,15 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_tmp28_ = _tmp27_->full_md5;
 #line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp28_ != NULL;
-#line 9400 "Photo.c"
+#line 9423 "Photo.c"
 	} else {
 #line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = FALSE;
-#line 9404 "Photo.c"
+#line 9427 "Photo.c"
 	}
 #line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp21_) {
-#line 9408 "Photo.c"
+#line 9431 "Photo.c"
 		PhotoImportParams* _tmp29_ = NULL;
 		PhotoImportParams* _tmp30_ = NULL;
 		PhotoFileSnifferOptions _tmp31_ = 0;
@@ -9418,7 +9441,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 9420 "Photo.c"
+#line 9443 "Photo.c"
 	}
 #line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = file;
@@ -9430,7 +9453,7 @@ 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 9432 "Photo.c"
+#line 9455 "Photo.c"
 	{
 		PhotoFileInterrogator* _tmp36_ = NULL;
 #line 1181 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9439,7 +9462,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		photo_file_interrogator_interrogate (_tmp36_, &_inner_error_);
 #line 1181 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9441 "Photo.c"
+#line 9464 "Photo.c"
 			goto __catch300_g_error;
 		}
 	}
@@ -9482,7 +9505,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9484 "Photo.c"
+#line 9507 "Photo.c"
 	}
 	__finally300:
 #line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9499,7 +9522,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 9501 "Photo.c"
+#line 9524 "Photo.c"
 	}
 #line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = interrogator;
@@ -9517,7 +9540,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1189 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9519 "Photo.c"
+#line 9542 "Photo.c"
 	}
 #line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = interrogator;
@@ -9531,7 +9554,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	if (_tmp47_ == NULL) {
 #line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = TRUE;
-#line 9533 "Photo.c"
+#line 9556 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp48_ = NULL;
 		PhotoFileFormat _tmp49_ = 0;
@@ -9541,7 +9564,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_tmp49_ = _tmp48_->file_format;
 #line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = _tmp49_ == PHOTO_FILE_FORMAT_UNKNOWN;
-#line 9543 "Photo.c"
+#line 9566 "Photo.c"
 	}
 #line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp46_) {
@@ -9557,7 +9580,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9559 "Photo.c"
+#line 9582 "Photo.c"
 	}
 #line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp50_ = params;
@@ -9565,7 +9588,7 @@ 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 9567 "Photo.c"
+#line 9590 "Photo.c"
 		DetectedPhotoInformation* _tmp52_ = NULL;
 		PhotoImportParams* _tmp53_ = NULL;
 		const gchar* _tmp54_ = NULL;
@@ -9614,7 +9637,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 9616 "Photo.c"
+#line 9639 "Photo.c"
 	}
 #line 1203 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation = ORIENTATION_TOP_LEFT;
@@ -9636,7 +9659,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	_tmp67_ = _tmp66_->metadata;
 #line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp67_ != NULL) {
-#line 9638 "Photo.c"
+#line 9661 "Photo.c"
 		MetadataDateTime* date_time = NULL;
 		DetectedPhotoInformation* _tmp68_ = NULL;
 		PhotoMetadata* _tmp69_ = NULL;
@@ -9670,7 +9693,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_tmp71_ = date_time;
 #line 1216 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp71_ != NULL) {
-#line 9672 "Photo.c"
+#line 9695 "Photo.c"
 			MetadataDateTime* _tmp72_ = NULL;
 			time_t _tmp73_ = 0;
 #line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9679,7 +9702,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 			_tmp73_ = metadata_date_time_get_timestamp (_tmp72_);
 #line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
 			exposure_time = _tmp73_;
-#line 9681 "Photo.c"
+#line 9704 "Photo.c"
 		}
 #line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp74_ = detected;
@@ -9731,7 +9754,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 9733 "Photo.c"
+#line 9756 "Photo.c"
 	}
 #line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp92_ = detected;
@@ -9741,7 +9764,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	if (_tmp93_ != GDK_COLORSPACE_RGB) {
 #line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp91_ = TRUE;
-#line 9743 "Photo.c"
+#line 9766 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp94_ = NULL;
 		gint _tmp95_ = 0;
@@ -9751,13 +9774,13 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_tmp95_ = _tmp94_->channels;
 #line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp91_ = _tmp95_ < 3;
-#line 9753 "Photo.c"
+#line 9776 "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 9759 "Photo.c"
+#line 9782 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp96_ = NULL;
 		gint _tmp97_ = 0;
@@ -9767,11 +9790,11 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_tmp97_ = _tmp96_->bits_per_channel;
 #line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp90_ = _tmp97_ != 8;
-#line 9769 "Photo.c"
+#line 9792 "Photo.c"
 	}
 #line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp90_) {
-#line 9773 "Photo.c"
+#line 9796 "Photo.c"
 		GFile* _tmp98_ = NULL;
 		gchar* _tmp99_ = NULL;
 		gchar* _tmp100_ = NULL;
@@ -9801,7 +9824,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9803 "Photo.c"
+#line 9826 "Photo.c"
 	}
 #line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp101_ = params;
@@ -10013,7 +10036,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	_tmp177_ = _tmp176_->thumbnails;
 #line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp177_ != NULL) {
-#line 10015 "Photo.c"
+#line 10038 "Photo.c"
 		PhotoFileReader* reader = NULL;
 		PhotoImportParams* _tmp178_ = NULL;
 		PhotoRow* _tmp179_ = NULL;
@@ -10049,7 +10072,7 @@ 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 10051 "Photo.c"
+#line 10074 "Photo.c"
 		{
 			PhotoImportParams* _tmp188_ = NULL;
 			Thumbnails* _tmp189_ = NULL;
@@ -10085,7 +10108,7 @@ 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 10087 "Photo.c"
+#line 10110 "Photo.c"
 				goto __catch301_g_error;
 			}
 		}
@@ -10123,7 +10146,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 			_g_object_unref0 (file);
 #line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 10125 "Photo.c"
+#line 10148 "Photo.c"
 		}
 		__finally301:
 #line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10148,11 +10171,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 10150 "Photo.c"
+#line 10173 "Photo.c"
 		}
 #line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 10154 "Photo.c"
+#line 10177 "Photo.c"
 	}
 #line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = IMPORT_RESULT_SUCCESS;
@@ -10170,7 +10193,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	_g_object_unref0 (file);
 #line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 10172 "Photo.c"
+#line 10195 "Photo.c"
 }
 
 
@@ -10409,7 +10432,7 @@ 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 10411 "Photo.c"
+#line 10434 "Photo.c"
 	{
 		DetectedPhotoInformation* detected = NULL;
 		DetectedPhotoInformation* _tmp57_ = NULL;
@@ -10420,7 +10443,7 @@ void photo_create_pre_import (PhotoImportParams* params) {
 		photo_file_interrogator_interrogate (interrogator, &_inner_error_);
 #line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10422 "Photo.c"
+#line 10445 "Photo.c"
 			goto __catch302_g_error;
 		}
 #line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10431,21 +10454,21 @@ void photo_create_pre_import (PhotoImportParams* params) {
 		_tmp60_ = detected;
 #line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp60_ != NULL) {
-#line 10433 "Photo.c"
+#line 10456 "Photo.c"
 			gboolean _tmp61_ = FALSE;
 #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 10439 "Photo.c"
+#line 10462 "Photo.c"
 		} else {
 #line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp59_ = FALSE;
-#line 10443 "Photo.c"
+#line 10466 "Photo.c"
 		}
 #line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp59_) {
-#line 10447 "Photo.c"
+#line 10470 "Photo.c"
 			DetectedPhotoInformation* _tmp62_ = NULL;
 			PhotoFileFormat _tmp63_ = 0;
 #line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10454,15 +10477,15 @@ void photo_create_pre_import (PhotoImportParams* params) {
 			_tmp63_ = _tmp62_->file_format;
 #line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp58_ = _tmp63_ != PHOTO_FILE_FORMAT_UNKNOWN;
-#line 10456 "Photo.c"
+#line 10479 "Photo.c"
 		} else {
 #line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp58_ = FALSE;
-#line 10460 "Photo.c"
+#line 10483 "Photo.c"
 		}
 #line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp58_) {
-#line 10464 "Photo.c"
+#line 10487 "Photo.c"
 			PhotoImportParams* _tmp64_ = NULL;
 			PhotoRow* _tmp65_ = NULL;
 			BackingPhotoRow* _tmp66_ = NULL;
@@ -10480,11 +10503,11 @@ 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 10482 "Photo.c"
+#line 10505 "Photo.c"
 		}
 #line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 10486 "Photo.c"
+#line 10509 "Photo.c"
 	}
 	goto __finally302;
 	__catch302_g_error:
@@ -10512,7 +10535,7 @@ void photo_create_pre_import (PhotoImportParams* params) {
 		_g_free0 (_tmp70_);
 #line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 10514 "Photo.c"
+#line 10537 "Photo.c"
 	}
 	__finally302:
 #line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10527,13 +10550,13 @@ void photo_create_pre_import (PhotoImportParams* params) {
 		g_clear_error (&_inner_error_);
 #line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 10529 "Photo.c"
+#line 10552 "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 10535 "Photo.c"
+#line 10558 "Photo.c"
 }
 
 
@@ -10589,7 +10612,7 @@ 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 10591 "Photo.c"
+#line 10614 "Photo.c"
 	{
 		GFileInfo* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
@@ -10603,7 +10626,7 @@ 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 10605 "Photo.c"
+#line 10628 "Photo.c"
 			goto __catch303_g_error;
 		}
 #line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10616,7 +10639,7 @@ 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 10618 "Photo.c"
+#line 10641 "Photo.c"
 	}
 	goto __finally303;
 	__catch303_g_error:
@@ -10657,15 +10680,15 @@ 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 10659 "Photo.c"
+#line 10682 "Photo.c"
 		} else {
 #line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 10663 "Photo.c"
+#line 10686 "Photo.c"
 		}
 #line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 10667 "Photo.c"
+#line 10690 "Photo.c"
 	}
 	__finally303:
 #line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10678,7 +10701,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 10680 "Photo.c"
+#line 10703 "Photo.c"
 	}
 #line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = file;
@@ -10704,7 +10727,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 10706 "Photo.c"
+#line 10729 "Photo.c"
 	}
 #line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = interrogator;
@@ -10720,7 +10743,7 @@ 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 10722 "Photo.c"
+#line 10745 "Photo.c"
 	} else {
 		PhotoFileInterrogator* _tmp18_ = NULL;
 		gboolean _tmp19_ = FALSE;
@@ -10730,11 +10753,11 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 		_tmp19_ = photo_file_interrogator_get_is_photo_corrupted (_tmp18_);
 #line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp19_;
-#line 10732 "Photo.c"
+#line 10755 "Photo.c"
 	}
 #line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_) {
-#line 10736 "Photo.c"
+#line 10759 "Photo.c"
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
 #line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10757,15 +10780,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 10759 "Photo.c"
+#line 10782 "Photo.c"
 		} else {
 #line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 10763 "Photo.c"
+#line 10786 "Photo.c"
 		}
 #line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 10767 "Photo.c"
+#line 10790 "Photo.c"
 	}
 #line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = info;
@@ -10821,7 +10844,7 @@ 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 10823 "Photo.c"
+#line 10846 "Photo.c"
 		DetectedPhotoInformation* _tmp42_ = NULL;
 		PhotoMetadata* _tmp43_ = NULL;
 		Orientation _tmp44_ = 0;
@@ -10833,11 +10856,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 10835 "Photo.c"
+#line 10858 "Photo.c"
 	} else {
 #line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = ORIENTATION_TOP_LEFT;
-#line 10839 "Photo.c"
+#line 10862 "Photo.c"
 	}
 #line 1344 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = backing;
@@ -10853,15 +10876,15 @@ 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 10855 "Photo.c"
+#line 10878 "Photo.c"
 	} else {
 #line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (_vala_detected);
-#line 10859 "Photo.c"
+#line 10882 "Photo.c"
 	}
 #line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 10863 "Photo.c"
+#line 10886 "Photo.c"
 }
 
 
@@ -10872,13 +10895,13 @@ static void _vala_array_add88 (gchar*** array, int* length, int* size, gchar* va
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10874 "Photo.c"
+#line 10897 "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 10880 "Photo.c"
+#line 10903 "Photo.c"
 }
 
 
@@ -10889,13 +10912,13 @@ static void _vala_array_add89 (gchar*** array, int* length, int* size, gchar* va
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10891 "Photo.c"
+#line 10914 "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 10897 "Photo.c"
+#line 10920 "Photo.c"
 }
 
 
@@ -10906,13 +10929,13 @@ static void _vala_array_add90 (gchar*** array, int* length, int* size, gchar* va
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10908 "Photo.c"
+#line 10931 "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 10914 "Photo.c"
+#line 10937 "Photo.c"
 }
 
 
@@ -10923,13 +10946,13 @@ static void _vala_array_add91 (gchar*** array, int* length, int* size, gchar* va
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10925 "Photo.c"
+#line 10948 "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 10931 "Photo.c"
+#line 10954 "Photo.c"
 }
 
 
@@ -10940,13 +10963,13 @@ static void _vala_array_add92 (gchar*** array, int* length, int* size, gchar* va
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10942 "Photo.c"
+#line 10965 "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 10948 "Photo.c"
+#line 10971 "Photo.c"
 }
 
 
@@ -10957,20 +10980,20 @@ static void _vala_array_add93 (gchar*** array, int* length, int* size, gchar* va
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10959 "Photo.c"
+#line 10982 "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 10965 "Photo.c"
+#line 10988 "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 10972 "Photo.c"
+#line 10995 "Photo.c"
 }
 
 
@@ -10987,51 +11010,51 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 	GFile* _tmp4_ = NULL;
 	DetectedPhotoInformation* _tmp5_ = NULL;
 	BackingPhotoRow* _tmp6_ = NULL;
-	BackingPhotoRow* _tmp7_ = NULL;
-	gboolean _tmp11_ = FALSE;
+	BackingPhotoRow* _tmp8_ = NULL;
 	gboolean _tmp12_ = FALSE;
-	DetectedPhotoInformation* _tmp13_ = NULL;
-	GdkColorspace _tmp14_ = 0;
+	gboolean _tmp13_ = FALSE;
+	DetectedPhotoInformation* _tmp14_ = NULL;
+	GdkColorspace _tmp15_ = 0;
 	PhotoRow* updated_row = NULL;
-	PhotoRow* _tmp22_ = NULL;
+	PhotoRow* _tmp23_ = NULL;
 	gchar** list = NULL;
-	gchar** _tmp27_ = NULL;
+	gchar** _tmp29_ = NULL;
 	gint list_length1 = 0;
 	gint _list_size_ = 0;
-	PhotoRow* _tmp28_ = NULL;
-	const gchar* _tmp29_ = NULL;
-	DetectedPhotoInformation* _tmp30_ = NULL;
+	PhotoRow* _tmp30_ = NULL;
 	const gchar* _tmp31_ = NULL;
-	PhotoRow* _tmp34_ = NULL;
-	BackingPhotoRow* _tmp35_ = NULL;
-	Orientation _tmp36_ = 0;
+	DetectedPhotoInformation* _tmp32_ = NULL;
+	const gchar* _tmp33_ = NULL;
+	PhotoRow* _tmp36_ = NULL;
 	BackingPhotoRow* _tmp37_ = NULL;
 	Orientation _tmp38_ = 0;
-	DetectedPhotoInformation* _tmp45_ = NULL;
-	PhotoMetadata* _tmp46_ = NULL;
-	PhotoRow* _tmp83_ = NULL;
-	BackingPhotoRow* _tmp84_ = NULL;
-	BackingPhotoRow* _tmp85_ = NULL;
-	PhotoRow* _tmp86_ = NULL;
-	DetectedPhotoInformation* _tmp87_ = NULL;
-	const gchar* _tmp88_ = NULL;
-	gchar* _tmp89_ = NULL;
-	PhotoRow* _tmp90_ = NULL;
-	DetectedPhotoInformation* _tmp91_ = NULL;
-	const gchar* _tmp92_ = NULL;
-	gchar* _tmp93_ = NULL;
-	PhotoRow* _tmp94_ = NULL;
-	DetectedPhotoInformation* _tmp95_ = NULL;
-	const gchar* _tmp96_ = NULL;
-	gchar* _tmp97_ = NULL;
+	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;
 	PhotoMetadata* metadata = NULL;
-	DetectedPhotoInformation* _tmp98_ = NULL;
-	PhotoMetadata* _tmp99_ = NULL;
-	PhotoRow* _tmp122_ = NULL;
-	PhotoMetadata* _tmp123_ = NULL;
-	gchar** _tmp124_ = NULL;
-	gint _tmp124__length1 = 0;
-	PhotoReimportMasterStateImpl* _tmp125_ = NULL;
+	DetectedPhotoInformation* _tmp100_ = NULL;
+	PhotoMetadata* _tmp101_ = NULL;
+	PhotoRow* _tmp124_ = NULL;
+	PhotoMetadata* _tmp125_ = NULL;
+	gchar** _tmp126_ = NULL;
+	gint _tmp126__length1 = 0;
+	PhotoReimportMasterStateImpl* _tmp127_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 1411 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -11063,6 +11086,8 @@ 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"
+		gboolean _tmp7_ = FALSE;
 #line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
 #line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11070,27 +11095,27 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 #line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
 #line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 11073 "Photo.c"
+		return _tmp7_;
+#line 11098 "Photo.c"
 	}
 #line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp7_ = backing;
+	_tmp8_ = backing;
 #line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp7_ == NULL) {
-#line 11079 "Photo.c"
-		GFile* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
+	if (_tmp8_ == NULL) {
+#line 11104 "Photo.c"
+		GFile* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
+		gchar* _tmp11_ = NULL;
 #line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp8_ = file;
+		_tmp9_ = file;
 #line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp9_ = g_file_get_path (_tmp8_);
+		_tmp10_ = g_file_get_path (_tmp9_);
 #line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp10_ = _tmp9_;
+		_tmp11_ = _tmp10_;
 #line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:1420: Unable to retrieve photo state from %s for reimport", _tmp10_);
+		g_warning ("Photo.vala:1420: Unable to retrieve photo state from %s for reimport", _tmp11_);
 #line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp10_);
+		_g_free0 (_tmp11_);
 #line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
 #line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11103,68 +11128,68 @@ 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 11105 "Photo.c"
+#line 11130 "Photo.c"
 		} else {
 #line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 11109 "Photo.c"
+#line 11134 "Photo.c"
 		}
 #line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 11113 "Photo.c"
+#line 11138 "Photo.c"
 	}
 #line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp13_ = detected;
+	_tmp14_ = detected;
 #line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp14_ = _tmp13_->colorspace;
+	_tmp15_ = _tmp14_->colorspace;
 #line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp14_ != GDK_COLORSPACE_RGB) {
+	if (_tmp15_ != GDK_COLORSPACE_RGB) {
 #line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp12_ = TRUE;
-#line 11123 "Photo.c"
+		_tmp13_ = TRUE;
+#line 11148 "Photo.c"
 	} else {
-		DetectedPhotoInformation* _tmp15_ = NULL;
-		gint _tmp16_ = 0;
+		DetectedPhotoInformation* _tmp16_ = NULL;
+		gint _tmp17_ = 0;
 #line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp15_ = detected;
+		_tmp16_ = detected;
 #line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp16_ = _tmp15_->channels;
+		_tmp17_ = _tmp16_->channels;
 #line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp12_ = _tmp16_ < 3;
-#line 11133 "Photo.c"
+		_tmp13_ = _tmp17_ < 3;
+#line 11158 "Photo.c"
 	}
 #line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp12_) {
+	if (_tmp13_) {
 #line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp11_ = TRUE;
-#line 11139 "Photo.c"
+		_tmp12_ = TRUE;
+#line 11164 "Photo.c"
 	} else {
-		DetectedPhotoInformation* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
+		DetectedPhotoInformation* _tmp18_ = NULL;
+		gint _tmp19_ = 0;
 #line 1427 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp17_ = detected;
+		_tmp18_ = detected;
 #line 1427 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp18_ = _tmp17_->bits_per_channel;
+		_tmp19_ = _tmp18_->bits_per_channel;
 #line 1427 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp11_ = _tmp18_ != 8;
-#line 11149 "Photo.c"
+		_tmp12_ = _tmp19_ != 8;
+#line 11174 "Photo.c"
 	}
 #line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp11_) {
-#line 11153 "Photo.c"
-		GFile* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
+	if (_tmp12_) {
+#line 11178 "Photo.c"
+		GFile* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
+		gchar* _tmp22_ = NULL;
 #line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp19_ = file;
+		_tmp20_ = file;
 #line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp20_ = g_file_get_path (_tmp19_);
+		_tmp21_ = g_file_get_path (_tmp20_);
 #line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp21_ = _tmp20_;
+		_tmp22_ = _tmp21_;
 #line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:1428: Not re-importing %s: Unsupported color format", _tmp21_);
+		g_warning ("Photo.vala:1428: Not re-importing %s: Unsupported color format", _tmp22_);
 #line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp21_);
+		_g_free0 (_tmp22_);
 #line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
 #line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11177,52 +11202,54 @@ 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 11179 "Photo.c"
+#line 11204 "Photo.c"
 		} else {
 #line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 11183 "Photo.c"
+#line 11208 "Photo.c"
 		}
 #line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 11187 "Photo.c"
+#line 11212 "Photo.c"
 	}
 #line 1434 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp22_ = photo_row_new ();
+	_tmp23_ = photo_row_new ();
 #line 1434 "/home/jens/Source/shotwell/src/Photo.vala"
-	updated_row = _tmp22_;
-#line 11193 "Photo.c"
+	updated_row = _tmp23_;
+#line 11218 "Photo.c"
 	{
-		PhotoRow* _tmp23_ = NULL;
+		PhotoRow* _tmp24_ = NULL;
 #line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp23_ = self->row;
+		_tmp24_ = self->row;
 #line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 11200 "Photo.c"
+#line 11225 "Photo.c"
 		{
-			PhotoRow* _tmp24_ = NULL;
 			PhotoRow* _tmp25_ = NULL;
+			PhotoRow* _tmp26_ = NULL;
 #line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp24_ = self->row;
+			_tmp25_ = self->row;
 #line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp25_ = _photo_row_ref0 (_tmp24_);
+			_tmp26_ = _photo_row_ref0 (_tmp25_);
 #line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_row_unref0 (updated_row);
 #line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
-			updated_row = _tmp25_;
-#line 11212 "Photo.c"
+			updated_row = _tmp26_;
+#line 11237 "Photo.c"
 		}
 		__finally304:
 		{
-			PhotoRow* _tmp26_ = NULL;
+			PhotoRow* _tmp27_ = NULL;
 #line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp26_ = self->row;
+			_tmp27_ = self->row;
 #line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 11221 "Photo.c"
+#line 11246 "Photo.c"
 		}
 #line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 11250 "Photo.c"
+			gboolean _tmp28_ = FALSE;
 #line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
 #line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11234,420 +11261,420 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 #line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
 #line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
-			return FALSE;
-#line 11237 "Photo.c"
+			return _tmp28_;
+#line 11264 "Photo.c"
 		}
 	}
 #line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp27_ = g_new0 (gchar*, 0 + 1);
+	_tmp29_ = g_new0 (gchar*, 0 + 1);
 #line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
-	list = _tmp27_;
+	list = _tmp29_;
 #line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
 	list_length1 = 0;
 #line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
 	_list_size_ = list_length1;
 #line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp28_ = updated_row;
+	_tmp30_ = updated_row;
 #line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp29_ = _tmp28_->md5;
+	_tmp31_ = _tmp30_->md5;
 #line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp30_ = detected;
+	_tmp32_ = detected;
 #line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp31_ = _tmp30_->md5;
+	_tmp33_ = _tmp32_->md5;
 #line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (g_strcmp0 (_tmp29_, _tmp31_) != 0) {
-#line 11258 "Photo.c"
-		gchar** _tmp32_ = NULL;
-		gint _tmp32__length1 = 0;
-		gchar* _tmp33_ = NULL;
+	if (g_strcmp0 (_tmp31_, _tmp33_) != 0) {
+#line 11285 "Photo.c"
+		gchar** _tmp34_ = NULL;
+		gint _tmp34__length1 = 0;
+		gchar* _tmp35_ = NULL;
 #line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp32_ = list;
+		_tmp34_ = list;
 #line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp32__length1 = list_length1;
+		_tmp34__length1 = list_length1;
 #line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp33_ = g_strdup ("metadata:md5");
+		_tmp35_ = g_strdup ("metadata:md5");
 #line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add88 (&list, &list_length1, &_list_size_, _tmp33_);
-#line 11270 "Photo.c"
+		_vala_array_add88 (&list, &list_length1, &_list_size_, _tmp35_);
+#line 11297 "Photo.c"
 	}
 #line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp34_ = updated_row;
+	_tmp36_ = updated_row;
 #line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp35_ = _tmp34_->master;
+	_tmp37_ = _tmp36_->master;
 #line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp36_ = _tmp35_->original_orientation;
+	_tmp38_ = _tmp37_->original_orientation;
 #line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp37_ = backing;
+	_tmp39_ = backing;
 #line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp38_ = _tmp37_->original_orientation;
+	_tmp40_ = _tmp39_->original_orientation;
 #line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp36_ != _tmp38_) {
-#line 11284 "Photo.c"
-		gchar** _tmp39_ = NULL;
-		gint _tmp39__length1 = 0;
-		gchar* _tmp40_ = NULL;
-		PhotoRow* _tmp41_ = NULL;
-		BackingPhotoRow* _tmp42_ = NULL;
-		BackingPhotoRow* _tmp43_ = NULL;
-		Orientation _tmp44_ = 0;
+	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 1446 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp39_ = list;
+		_tmp41_ = list;
 #line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp39__length1 = list_length1;
+		_tmp41__length1 = list_length1;
 #line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp40_ = g_strdup ("image:orientation");
+		_tmp42_ = g_strdup ("image:orientation");
 #line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add89 (&list, &list_length1, &_list_size_, _tmp40_);
+		_vala_array_add89 (&list, &list_length1, &_list_size_, _tmp42_);
 #line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp41_ = updated_row;
+		_tmp43_ = updated_row;
 #line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp42_ = _tmp41_->master;
+		_tmp44_ = _tmp43_->master;
 #line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp43_ = backing;
+		_tmp45_ = backing;
 #line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp44_ = _tmp43_->original_orientation;
+		_tmp46_ = _tmp45_->original_orientation;
 #line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp42_->original_orientation = _tmp44_;
-#line 11310 "Photo.c"
+		_tmp44_->original_orientation = _tmp46_;
+#line 11337 "Photo.c"
 	}
 #line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp45_ = detected;
+	_tmp47_ = detected;
 #line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp46_ = _tmp45_->metadata;
+	_tmp48_ = _tmp47_->metadata;
 #line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp46_ != NULL) {
-#line 11318 "Photo.c"
+	if (_tmp48_ != NULL) {
+#line 11345 "Photo.c"
 		MetadataDateTime* date_time = NULL;
-		DetectedPhotoInformation* _tmp47_ = NULL;
-		PhotoMetadata* _tmp48_ = NULL;
-		MetadataDateTime* _tmp49_ = NULL;
-		gboolean _tmp50_ = FALSE;
+		DetectedPhotoInformation* _tmp49_ = NULL;
+		PhotoMetadata* _tmp50_ = NULL;
 		MetadataDateTime* _tmp51_ = NULL;
-		PhotoRow* _tmp58_ = NULL;
-		const gchar* _tmp59_ = NULL;
-		DetectedPhotoInformation* _tmp60_ = NULL;
-		PhotoMetadata* _tmp61_ = NULL;
-		gchar* _tmp62_ = NULL;
-		gchar* _tmp63_ = NULL;
-		gboolean _tmp64_ = FALSE;
-		PhotoRow* _tmp67_ = NULL;
-		const gchar* _tmp68_ = NULL;
-		DetectedPhotoInformation* _tmp69_ = NULL;
-		PhotoMetadata* _tmp70_ = NULL;
-		gchar* _tmp71_ = NULL;
-		gchar* _tmp72_ = NULL;
-		gboolean _tmp73_ = FALSE;
-		PhotoRow* _tmp76_ = NULL;
-		Rating _tmp77_ = 0;
-		DetectedPhotoInformation* _tmp78_ = NULL;
-		PhotoMetadata* _tmp79_ = NULL;
-		Rating _tmp80_ = 0;
+		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;
 #line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp47_ = detected;
+		_tmp49_ = detected;
 #line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp48_ = _tmp47_->metadata;
+		_tmp50_ = _tmp49_->metadata;
 #line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp49_ = photo_metadata_get_exposure_date_time (_tmp48_);
+		_tmp51_ = photo_metadata_get_exposure_date_time (_tmp50_);
 #line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
-		date_time = _tmp49_;
+		date_time = _tmp51_;
 #line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp51_ = date_time;
+		_tmp53_ = date_time;
 #line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
-		if (_tmp51_ != NULL) {
-#line 11356 "Photo.c"
-			PhotoRow* _tmp52_ = NULL;
-			time_t _tmp53_ = 0;
-			MetadataDateTime* _tmp54_ = NULL;
+		if (_tmp53_ != NULL) {
+#line 11383 "Photo.c"
+			PhotoRow* _tmp54_ = NULL;
 			time_t _tmp55_ = 0;
+			MetadataDateTime* _tmp56_ = NULL;
+			time_t _tmp57_ = 0;
 #line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp52_ = updated_row;
+			_tmp54_ = updated_row;
 #line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp53_ = _tmp52_->exposure_time;
+			_tmp55_ = _tmp54_->exposure_time;
 #line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp54_ = date_time;
+			_tmp56_ = date_time;
 #line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp55_ = metadata_date_time_get_timestamp (_tmp54_);
+			_tmp57_ = metadata_date_time_get_timestamp (_tmp56_);
 #line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp50_ = _tmp53_ != _tmp55_;
-#line 11371 "Photo.c"
+			_tmp52_ = _tmp55_ != _tmp57_;
+#line 11398 "Photo.c"
 		} else {
 #line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp50_ = FALSE;
-#line 11375 "Photo.c"
+			_tmp52_ = FALSE;
+#line 11402 "Photo.c"
 		}
 #line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
-		if (_tmp50_) {
-#line 11379 "Photo.c"
-			gchar** _tmp56_ = NULL;
-			gint _tmp56__length1 = 0;
-			gchar* _tmp57_ = NULL;
+		if (_tmp52_) {
+#line 11406 "Photo.c"
+			gchar** _tmp58_ = NULL;
+			gint _tmp58__length1 = 0;
+			gchar* _tmp59_ = NULL;
 #line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp56_ = list;
+			_tmp58_ = list;
 #line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp56__length1 = list_length1;
+			_tmp58__length1 = list_length1;
 #line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp57_ = g_strdup ("metadata:exposure-time");
+			_tmp59_ = g_strdup ("metadata:exposure-time");
 #line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add90 (&list, &list_length1, &_list_size_, _tmp57_);
-#line 11391 "Photo.c"
+			_vala_array_add90 (&list, &list_length1, &_list_size_, _tmp59_);
+#line 11418 "Photo.c"
 		}
 #line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp58_ = updated_row;
+		_tmp60_ = updated_row;
 #line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp59_ = _tmp58_->title;
+		_tmp61_ = _tmp60_->title;
 #line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp60_ = detected;
+		_tmp62_ = detected;
 #line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp61_ = _tmp60_->metadata;
+		_tmp63_ = _tmp62_->metadata;
 #line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp62_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_MEDIA_METADATA, MediaMetadata));
+		_tmp64_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_MEDIA_METADATA, MediaMetadata));
 #line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp63_ = _tmp62_;
+		_tmp65_ = _tmp64_;
 #line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp64_ = g_strcmp0 (_tmp59_, _tmp63_) != 0;
+		_tmp66_ = g_strcmp0 (_tmp61_, _tmp65_) != 0;
 #line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp63_);
+		_g_free0 (_tmp65_);
 #line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
-		if (_tmp64_) {
-#line 11411 "Photo.c"
-			gchar** _tmp65_ = NULL;
-			gint _tmp65__length1 = 0;
-			gchar* _tmp66_ = NULL;
+		if (_tmp66_) {
+#line 11438 "Photo.c"
+			gchar** _tmp67_ = NULL;
+			gint _tmp67__length1 = 0;
+			gchar* _tmp68_ = NULL;
 #line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp65_ = list;
+			_tmp67_ = list;
 #line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp65__length1 = list_length1;
+			_tmp67__length1 = list_length1;
 #line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp66_ = g_strdup ("metadata:name");
+			_tmp68_ = g_strdup ("metadata:name");
 #line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add91 (&list, &list_length1, &_list_size_, _tmp66_);
-#line 11423 "Photo.c"
+			_vala_array_add91 (&list, &list_length1, &_list_size_, _tmp68_);
+#line 11450 "Photo.c"
 		}
 #line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp67_ = updated_row;
+		_tmp69_ = updated_row;
 #line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp68_ = _tmp67_->comment;
+		_tmp70_ = _tmp69_->comment;
 #line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp69_ = detected;
+		_tmp71_ = detected;
 #line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp70_ = _tmp69_->metadata;
+		_tmp72_ = _tmp71_->metadata;
 #line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp71_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_MEDIA_METADATA, MediaMetadata));
+		_tmp73_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_MEDIA_METADATA, MediaMetadata));
 #line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp72_ = _tmp71_;
+		_tmp74_ = _tmp73_;
 #line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp73_ = g_strcmp0 (_tmp68_, _tmp72_) != 0;
+		_tmp75_ = g_strcmp0 (_tmp70_, _tmp74_) != 0;
 #line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp72_);
+		_g_free0 (_tmp74_);
 #line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
-		if (_tmp73_) {
-#line 11443 "Photo.c"
-			gchar** _tmp74_ = NULL;
-			gint _tmp74__length1 = 0;
-			gchar* _tmp75_ = NULL;
+		if (_tmp75_) {
+#line 11470 "Photo.c"
+			gchar** _tmp76_ = NULL;
+			gint _tmp76__length1 = 0;
+			gchar* _tmp77_ = NULL;
 #line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp74_ = list;
+			_tmp76_ = list;
 #line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp74__length1 = list_length1;
+			_tmp76__length1 = list_length1;
 #line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp75_ = g_strdup ("metadata:comment");
+			_tmp77_ = g_strdup ("metadata:comment");
 #line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add92 (&list, &list_length1, &_list_size_, _tmp75_);
-#line 11455 "Photo.c"
+			_vala_array_add92 (&list, &list_length1, &_list_size_, _tmp77_);
+#line 11482 "Photo.c"
 		}
 #line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp76_ = updated_row;
+		_tmp78_ = updated_row;
 #line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp77_ = _tmp76_->rating;
+		_tmp79_ = _tmp78_->rating;
 #line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp78_ = detected;
+		_tmp80_ = detected;
 #line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp79_ = _tmp78_->metadata;
+		_tmp81_ = _tmp80_->metadata;
 #line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp80_ = photo_metadata_get_rating (_tmp79_);
+		_tmp82_ = photo_metadata_get_rating (_tmp81_);
 #line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
-		if (_tmp77_ != _tmp80_) {
-#line 11469 "Photo.c"
-			gchar** _tmp81_ = NULL;
-			gint _tmp81__length1 = 0;
-			gchar* _tmp82_ = NULL;
+		if (_tmp79_ != _tmp82_) {
+#line 11496 "Photo.c"
+			gchar** _tmp83_ = NULL;
+			gint _tmp83__length1 = 0;
+			gchar* _tmp84_ = NULL;
 #line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp81_ = list;
+			_tmp83_ = list;
 #line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp81__length1 = list_length1;
+			_tmp83__length1 = list_length1;
 #line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp82_ = g_strdup ("metadata:rating");
+			_tmp84_ = g_strdup ("metadata:rating");
 #line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add93 (&list, &list_length1, &_list_size_, _tmp82_);
-#line 11481 "Photo.c"
+			_vala_array_add93 (&list, &list_length1, &_list_size_, _tmp84_);
+#line 11508 "Photo.c"
 		}
 #line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 11485 "Photo.c"
+#line 11512 "Photo.c"
 	}
 #line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp83_ = updated_row;
+	_tmp85_ = updated_row;
 #line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp84_ = backing;
+	_tmp86_ = backing;
 #line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp85_ = _backing_photo_row_ref0 (_tmp84_);
+	_tmp87_ = _backing_photo_row_ref0 (_tmp86_);
 #line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
-	_backing_photo_row_unref0 (_tmp83_->master);
+	_backing_photo_row_unref0 (_tmp85_->master);
 #line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp83_->master = _tmp85_;
+	_tmp85_->master = _tmp87_;
 #line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp86_ = updated_row;
+	_tmp88_ = updated_row;
 #line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp87_ = detected;
+	_tmp89_ = detected;
 #line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp88_ = _tmp87_->md5;
+	_tmp90_ = _tmp89_->md5;
 #line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp89_ = g_strdup (_tmp88_);
+	_tmp91_ = g_strdup (_tmp90_);
 #line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_free0 (_tmp86_->md5);
+	_g_free0 (_tmp88_->md5);
 #line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp86_->md5 = _tmp89_;
+	_tmp88_->md5 = _tmp91_;
 #line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp90_ = updated_row;
+	_tmp92_ = updated_row;
 #line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp91_ = detected;
+	_tmp93_ = detected;
 #line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp92_ = _tmp91_->exif_md5;
+	_tmp94_ = _tmp93_->exif_md5;
 #line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp93_ = g_strdup (_tmp92_);
+	_tmp95_ = g_strdup (_tmp94_);
 #line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_free0 (_tmp90_->exif_md5);
+	_g_free0 (_tmp92_->exif_md5);
 #line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp90_->exif_md5 = _tmp93_;
+	_tmp92_->exif_md5 = _tmp95_;
 #line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp94_ = updated_row;
+	_tmp96_ = updated_row;
 #line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp95_ = detected;
+	_tmp97_ = detected;
 #line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp96_ = _tmp95_->thumbnail_md5;
+	_tmp98_ = _tmp97_->thumbnail_md5;
 #line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp97_ = g_strdup (_tmp96_);
+	_tmp99_ = g_strdup (_tmp98_);
 #line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_free0 (_tmp94_->thumbnail_md5);
+	_g_free0 (_tmp96_->thumbnail_md5);
 #line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp94_->thumbnail_md5 = _tmp97_;
+	_tmp96_->thumbnail_md5 = _tmp99_;
 #line 1470 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = NULL;
 #line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp98_ = detected;
+	_tmp100_ = detected;
 #line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp99_ = _tmp98_->metadata;
+	_tmp101_ = _tmp100_->metadata;
 #line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp99_ != NULL) {
-#line 11541 "Photo.c"
-		DetectedPhotoInformation* _tmp100_ = NULL;
-		PhotoMetadata* _tmp101_ = NULL;
-		PhotoMetadata* _tmp102_ = NULL;
-		MetadataDateTime* date_time = NULL;
-		DetectedPhotoInformation* _tmp103_ = NULL;
+	if (_tmp101_ != NULL) {
+#line 11568 "Photo.c"
+		DetectedPhotoInformation* _tmp102_ = NULL;
+		PhotoMetadata* _tmp103_ = NULL;
 		PhotoMetadata* _tmp104_ = NULL;
-		MetadataDateTime* _tmp105_ = NULL;
-		MetadataDateTime* _tmp106_ = NULL;
-		PhotoRow* _tmp110_ = NULL;
-		DetectedPhotoInformation* _tmp111_ = NULL;
-		PhotoMetadata* _tmp112_ = NULL;
-		gchar* _tmp113_ = NULL;
-		PhotoRow* _tmp114_ = NULL;
-		DetectedPhotoInformation* _tmp115_ = NULL;
-		PhotoMetadata* _tmp116_ = NULL;
-		gchar* _tmp117_ = NULL;
-		PhotoRow* _tmp118_ = NULL;
-		DetectedPhotoInformation* _tmp119_ = NULL;
-		PhotoMetadata* _tmp120_ = NULL;
-		Rating _tmp121_ = 0;
+		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;
 #line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp100_ = detected;
+		_tmp102_ = detected;
 #line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp101_ = _tmp100_->metadata;
+		_tmp103_ = _tmp102_->metadata;
 #line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp102_ = _media_metadata_ref0 (_tmp101_);
+		_tmp104_ = _media_metadata_ref0 (_tmp103_);
 #line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
 #line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
-		metadata = _tmp102_;
+		metadata = _tmp104_;
 #line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp103_ = detected;
+		_tmp105_ = detected;
 #line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp104_ = _tmp103_->metadata;
+		_tmp106_ = _tmp105_->metadata;
 #line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp105_ = photo_metadata_get_exposure_date_time (_tmp104_);
+		_tmp107_ = photo_metadata_get_exposure_date_time (_tmp106_);
 #line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
-		date_time = _tmp105_;
+		date_time = _tmp107_;
 #line 1475 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp106_ = date_time;
+		_tmp108_ = date_time;
 #line 1475 "/home/jens/Source/shotwell/src/Photo.vala"
-		if (_tmp106_ != NULL) {
-#line 11584 "Photo.c"
-			PhotoRow* _tmp107_ = NULL;
-			MetadataDateTime* _tmp108_ = NULL;
-			time_t _tmp109_ = 0;
+		if (_tmp108_ != NULL) {
+#line 11611 "Photo.c"
+			PhotoRow* _tmp109_ = NULL;
+			MetadataDateTime* _tmp110_ = NULL;
+			time_t _tmp111_ = 0;
 #line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp107_ = updated_row;
+			_tmp109_ = updated_row;
 #line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp108_ = date_time;
+			_tmp110_ = date_time;
 #line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp109_ = metadata_date_time_get_timestamp (_tmp108_);
+			_tmp111_ = metadata_date_time_get_timestamp (_tmp110_);
 #line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp107_->exposure_time = _tmp109_;
-#line 11596 "Photo.c"
+			_tmp109_->exposure_time = _tmp111_;
+#line 11623 "Photo.c"
 		}
 #line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp110_ = updated_row;
+		_tmp112_ = updated_row;
 #line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp111_ = detected;
+		_tmp113_ = detected;
 #line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp112_ = _tmp111_->metadata;
+		_tmp114_ = _tmp113_->metadata;
 #line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp113_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, TYPE_MEDIA_METADATA, MediaMetadata));
+		_tmp115_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, TYPE_MEDIA_METADATA, MediaMetadata));
 #line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp110_->title);
+		_g_free0 (_tmp112_->title);
 #line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp110_->title = _tmp113_;
+		_tmp112_->title = _tmp115_;
 #line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp114_ = updated_row;
+		_tmp116_ = updated_row;
 #line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp115_ = detected;
+		_tmp117_ = detected;
 #line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp116_ = _tmp115_->metadata;
+		_tmp118_ = _tmp117_->metadata;
 #line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp117_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, TYPE_MEDIA_METADATA, MediaMetadata));
+		_tmp119_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, TYPE_MEDIA_METADATA, MediaMetadata));
 #line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp114_->comment);
+		_g_free0 (_tmp116_->comment);
 #line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp114_->comment = _tmp117_;
+		_tmp116_->comment = _tmp119_;
 #line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp118_ = updated_row;
+		_tmp120_ = updated_row;
 #line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp119_ = detected;
+		_tmp121_ = detected;
 #line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp120_ = _tmp119_->metadata;
+		_tmp122_ = _tmp121_->metadata;
 #line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp121_ = photo_metadata_get_rating (_tmp120_);
+		_tmp123_ = photo_metadata_get_rating (_tmp122_);
 #line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp118_->rating = _tmp121_;
+		_tmp120_->rating = _tmp123_;
 #line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 11634 "Photo.c"
+#line 11661 "Photo.c"
 	}
 #line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp122_ = updated_row;
+	_tmp124_ = updated_row;
 #line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp123_ = metadata;
+	_tmp125_ = metadata;
 #line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp124_ = list;
+	_tmp126_ = list;
 #line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp124__length1 = list_length1;
+	_tmp126__length1 = list_length1;
 #line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp125_ = photo_reimport_master_state_impl_new (_tmp122_, _tmp123_, _tmp124_, _tmp124__length1);
+	_tmp127_ = photo_reimport_master_state_impl_new (_tmp124_, _tmp125_, _tmp126_, _tmp126__length1);
 #line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_master_state_unref0 (_vala_reimport_state);
 #line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_reimport_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState);
+	_vala_reimport_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState);
 #line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
 #line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11666,15 +11693,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 11668 "Photo.c"
+#line 11695 "Photo.c"
 	} else {
 #line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 11672 "Photo.c"
+#line 11699 "Photo.c"
 	}
 #line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 11676 "Photo.c"
+#line 11703 "Photo.c"
 }
 
 
@@ -11683,7 +11710,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 11685 "Photo.c"
+#line 11712 "Photo.c"
 }
 
 
@@ -11692,14 +11719,14 @@ 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 11694 "Photo.c"
+#line 11721 "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 11701 "Photo.c"
+#line 11728 "Photo.c"
 }
 
 
@@ -11710,13 +11737,13 @@ static void _vala_array_add94 (gchar*** array, int* length, int* size, gchar* va
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 11712 "Photo.c"
+#line 11739 "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 11718 "Photo.c"
+#line 11745 "Photo.c"
 }
 
 
@@ -11727,13 +11754,13 @@ static void _vala_array_add95 (gchar*** array, int* length, int* size, gchar* va
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 11729 "Photo.c"
+#line 11756 "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 11735 "Photo.c"
+#line 11762 "Photo.c"
 }
 
 
@@ -11782,7 +11809,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 11784 "Photo.c"
+#line 11811 "Photo.c"
 		} else {
 #line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (reimport_state);
@@ -11792,7 +11819,7 @@ 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 11794 "Photo.c"
+#line 11821 "Photo.c"
 		}
 	}
 	{
@@ -11801,7 +11828,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 		_tmp5_ = self->row;
 #line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 11803 "Photo.c"
+#line 11830 "Photo.c"
 		{
 			BackingPhotoRow* original_master = NULL;
 			PhotoRow* _tmp6_ = NULL;
@@ -11859,11 +11886,11 @@ 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 11861 "Photo.c"
+#line 11888 "Photo.c"
 			}
 #line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (original_master);
-#line 11865 "Photo.c"
+#line 11892 "Photo.c"
 		}
 		__finally305:
 		{
@@ -11872,7 +11899,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 			_tmp19_ = self->row;
 #line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 11874 "Photo.c"
+#line 11901 "Photo.c"
 		}
 #line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -11884,7 +11911,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 11886 "Photo.c"
+#line 11913 "Photo.c"
 			} else {
 #line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_reimport_master_state_unref0 (reimport_state);
@@ -11894,7 +11921,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 11896 "Photo.c"
+#line 11923 "Photo.c"
 			}
 		}
 	}
@@ -11902,19 +11929,19 @@ 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 11904 "Photo.c"
+#line 11931 "Photo.c"
 		PhotoMetadata* _tmp21_ = NULL;
 #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 11910 "Photo.c"
+#line 11937 "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 11916 "Photo.c"
+#line 11943 "Photo.c"
 		gchar** _tmp23_ = NULL;
 		gint _tmp23__length1 = 0;
 		gchar* _tmp24_ = NULL;
@@ -11931,7 +11958,7 @@ 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 11933 "Photo.c"
+#line 11960 "Photo.c"
 			gchar** _tmp26_ = NULL;
 			gint _tmp26__length1 = 0;
 			gchar* _tmp27_ = NULL;
@@ -11943,7 +11970,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 11945 "Photo.c"
+#line 11972 "Photo.c"
 		}
 	}
 #line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11952,7 +11979,7 @@ 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 11954 "Photo.c"
+#line 11981 "Photo.c"
 		gchar** _tmp29_ = NULL;
 		gint _tmp29__length1 = 0;
 		Alteration* _tmp30_ = NULL;
@@ -11969,7 +11996,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 11971 "Photo.c"
+#line 11998 "Photo.c"
 	}
 #line 1518 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = reimport_state->metadata;
@@ -11979,29 +12006,29 @@ 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 11981 "Photo.c"
+#line 12008 "Photo.c"
 		PhotoMetadata* _tmp34_ = NULL;
 #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 11987 "Photo.c"
+#line 12014 "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 11993 "Photo.c"
+#line 12020 "Photo.c"
 		PhotoMetadata* _tmp36_ = NULL;
 #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 11999 "Photo.c"
+#line 12026 "Photo.c"
 	}
 #line 1491 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_master_state_unref0 (reimport_state);
-#line 12003 "Photo.c"
+#line 12030 "Photo.c"
 }
 
 
@@ -12013,12 +12040,12 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin
 	GFile* _tmp1_ = NULL;
 	DetectedPhotoInformation* _tmp2_ = NULL;
 	BackingPhotoRow* _tmp3_ = NULL;
-	BackingPhotoRow* _tmp4_ = NULL;
 	BackingPhotoRow* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	BackingPhotoRow* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
-	DetectedPhotoInformation* _tmp8_ = NULL;
-	GdkColorspace _tmp9_ = 0;
+	gboolean _tmp8_ = FALSE;
+	DetectedPhotoInformation* _tmp9_ = NULL;
+	GdkColorspace _tmp10_ = 0;
 	GError * _inner_error_ = NULL;
 #line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -12036,24 +12063,26 @@ 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"
+		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 FALSE;
-#line 12042 "Photo.c"
+		return _tmp4_;
+#line 12071 "Photo.c"
 	}
 #line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp4_ = _tmp0_;
+	_tmp5_ = _tmp0_;
 #line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
 #line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_vala_backing);
 #line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_backing = _tmp4_;
+	_vala_backing = _tmp5_;
 #line 1532 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp5_ = _vala_backing;
+	_tmp6_ = _vala_backing;
 #line 1532 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp5_ == NULL) {
+	if (_tmp6_ == NULL) {
 #line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
 #line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12062,78 +12091,78 @@ 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 12064 "Photo.c"
+#line 12093 "Photo.c"
 		} else {
 #line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (_vala_backing);
-#line 12068 "Photo.c"
+#line 12097 "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 12074 "Photo.c"
+#line 12103 "Photo.c"
 		} else {
 #line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 12078 "Photo.c"
+#line 12107 "Photo.c"
 		}
 #line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12082 "Photo.c"
+#line 12111 "Photo.c"
 	}
 #line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp8_ = _vala_detected;
+	_tmp9_ = _vala_detected;
 #line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp9_ = _tmp8_->colorspace;
+	_tmp10_ = _tmp9_->colorspace;
 #line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp9_ != GDK_COLORSPACE_RGB) {
+	if (_tmp10_ != GDK_COLORSPACE_RGB) {
 #line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp7_ = TRUE;
-#line 12092 "Photo.c"
+		_tmp8_ = TRUE;
+#line 12121 "Photo.c"
 	} else {
-		DetectedPhotoInformation* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
+		DetectedPhotoInformation* _tmp11_ = NULL;
+		gint _tmp12_ = 0;
 #line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp10_ = _vala_detected;
+		_tmp11_ = _vala_detected;
 #line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp11_ = _tmp10_->channels;
+		_tmp12_ = _tmp11_->channels;
 #line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp7_ = _tmp11_ < 3;
-#line 12102 "Photo.c"
+		_tmp8_ = _tmp12_ < 3;
+#line 12131 "Photo.c"
 	}
 #line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp7_) {
+	if (_tmp8_) {
 #line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp6_ = TRUE;
-#line 12108 "Photo.c"
+		_tmp7_ = TRUE;
+#line 12137 "Photo.c"
 	} else {
-		DetectedPhotoInformation* _tmp12_ = NULL;
-		gint _tmp13_ = 0;
+		DetectedPhotoInformation* _tmp13_ = NULL;
+		gint _tmp14_ = 0;
 #line 1539 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp12_ = _vala_detected;
+		_tmp13_ = _vala_detected;
 #line 1539 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp13_ = _tmp12_->bits_per_channel;
+		_tmp14_ = _tmp13_->bits_per_channel;
 #line 1539 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp6_ = _tmp13_ != 8;
-#line 12118 "Photo.c"
+		_tmp7_ = _tmp14_ != 8;
+#line 12147 "Photo.c"
 	}
 #line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp6_) {
-#line 12122 "Photo.c"
-		GFile* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
+	if (_tmp7_) {
+#line 12151 "Photo.c"
+		GFile* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
+		gchar* _tmp17_ = NULL;
 #line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp14_ = file;
+		_tmp15_ = file;
 #line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp15_ = g_file_get_path (_tmp14_);
+		_tmp16_ = g_file_get_path (_tmp15_);
 #line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp16_ = _tmp15_;
+		_tmp17_ = _tmp16_;
 #line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:1540: Not re-importing %s: Unsupported color format", _tmp16_);
+		g_warning ("Photo.vala:1540: Not re-importing %s: Unsupported color format", _tmp17_);
 #line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp16_);
+		_g_free0 (_tmp17_);
 #line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
 #line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12142,25 +12171,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 12144 "Photo.c"
+#line 12173 "Photo.c"
 		} else {
 #line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (_vala_backing);
-#line 12148 "Photo.c"
+#line 12177 "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 12154 "Photo.c"
+#line 12183 "Photo.c"
 		} else {
 #line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 12158 "Photo.c"
+#line 12187 "Photo.c"
 		}
 #line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12162 "Photo.c"
+#line 12191 "Photo.c"
 	}
 #line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
@@ -12170,25 +12199,25 @@ 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 12172 "Photo.c"
+#line 12201 "Photo.c"
 	} else {
 #line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (_vala_backing);
-#line 12176 "Photo.c"
+#line 12205 "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 12182 "Photo.c"
+#line 12211 "Photo.c"
 	} else {
 #line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (_vala_detected);
-#line 12186 "Photo.c"
+#line 12215 "Photo.c"
 	}
 #line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 12190 "Photo.c"
+#line 12219 "Photo.c"
 }
 
 
@@ -12205,10 +12234,10 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable
 	BackingPhotoRow* _tmp4_ = NULL;
 	DetectedPhotoInformation* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
-	BackingPhotoRow* _tmp7_ = NULL;
-	DetectedPhotoInformation* _tmp8_ = NULL;
-	PhotoMetadata* _tmp9_ = NULL;
-	PhotoReimportEditableStateImpl* _tmp10_ = NULL;
+	BackingPhotoRow* _tmp8_ = NULL;
+	DetectedPhotoInformation* _tmp9_ = NULL;
+	PhotoMetadata* _tmp10_ = NULL;
+	PhotoReimportEditableStateImpl* _tmp11_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 1549 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -12232,15 +12261,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 12234 "Photo.c"
+#line 12263 "Photo.c"
 		} else {
 #line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 12238 "Photo.c"
+#line 12267 "Photo.c"
 		}
 #line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12242 "Photo.c"
+#line 12271 "Photo.c"
 	}
 #line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = file;
@@ -12258,6 +12287,8 @@ 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"
+		gboolean _tmp7_ = FALSE;
 #line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
 #line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12267,8 +12298,8 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable
 #line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
 #line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 12270 "Photo.c"
+		return _tmp7_;
+#line 12301 "Photo.c"
 	}
 #line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp2_) {
@@ -12284,28 +12315,28 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable
 		if (state) {
 #line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 12286 "Photo.c"
+#line 12317 "Photo.c"
 		} else {
 #line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 12290 "Photo.c"
+#line 12321 "Photo.c"
 		}
 #line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12294 "Photo.c"
+#line 12325 "Photo.c"
 	}
 #line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp7_ = backing;
+	_tmp8_ = backing;
 #line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp8_ = detected;
+	_tmp9_ = detected;
 #line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp9_ = _tmp8_->metadata;
+	_tmp10_ = _tmp9_->metadata;
 #line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp10_ = photo_reimport_editable_state_impl_new (_tmp7_, _tmp9_);
+	_tmp11_ = photo_reimport_editable_state_impl_new (_tmp8_, _tmp10_);
 #line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_editable_state_unref0 (_vala_state);
 #line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState);
+	_vala_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState);
 #line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
 #line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12318,22 +12349,22 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable
 	if (state) {
 #line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 12320 "Photo.c"
+#line 12351 "Photo.c"
 	} else {
 #line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_editable_state_unref0 (_vala_state);
-#line 12324 "Photo.c"
+#line 12355 "Photo.c"
 	}
 #line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 12328 "Photo.c"
+#line 12359 "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 12335 "Photo.c"
+#line 12366 "Photo.c"
 }
 
 
@@ -12374,7 +12405,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 	if (_tmp1_) {
 #line 1570 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 12376 "Photo.c"
+#line 12407 "Photo.c"
 	}
 #line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = state;
@@ -12388,7 +12419,7 @@ 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 12390 "Photo.c"
+#line 12421 "Photo.c"
 		BackingPhotoTable* _tmp6_ = NULL;
 		BackingPhotoTable* _tmp7_ = NULL;
 		PhotoReimportEditableStateImpl* _tmp8_ = NULL;
@@ -12415,7 +12446,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 12417 "Photo.c"
+#line 12448 "Photo.c"
 			} else {
 #line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_reimport_editable_state_unref0 (reimport_state);
@@ -12425,7 +12456,7 @@ 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 12427 "Photo.c"
+#line 12458 "Photo.c"
 			}
 		}
 		{
@@ -12434,7 +12465,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 			_tmp10_ = self->row;
 #line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 12436 "Photo.c"
+#line 12467 "Photo.c"
 			{
 				PhotoReimportEditableStateImpl* _tmp11_ = NULL;
 				BackingPhotoRow* _tmp12_ = NULL;
@@ -12462,7 +12493,7 @@ 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 12464 "Photo.c"
+#line 12495 "Photo.c"
 			}
 			__finally306:
 			{
@@ -12471,7 +12502,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 				_tmp17_ = self->row;
 #line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 12473 "Photo.c"
+#line 12504 "Photo.c"
 			}
 #line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -12483,7 +12514,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 12485 "Photo.c"
+#line 12516 "Photo.c"
 				} else {
 #line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_reimport_editable_state_unref0 (reimport_state);
@@ -12493,7 +12524,7 @@ 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 12495 "Photo.c"
+#line 12526 "Photo.c"
 				}
 			}
 		}
@@ -12509,7 +12540,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 12511 "Photo.c"
+#line 12542 "Photo.c"
 	}
 #line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = reimport_state;
@@ -12517,7 +12548,7 @@ 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 12519 "Photo.c"
+#line 12550 "Photo.c"
 		PhotoReimportEditableStateImpl* _tmp23_ = NULL;
 		PhotoMetadata* _tmp24_ = NULL;
 		gchar* _tmp25_ = NULL;
@@ -12569,7 +12600,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 12571 "Photo.c"
+#line 12602 "Photo.c"
 	}
 #line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time");
@@ -12581,7 +12612,7 @@ 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 12583 "Photo.c"
+#line 12614 "Photo.c"
 		const gchar* _tmp39_ = NULL;
 		gchar* _tmp40_ = NULL;
 #line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12592,7 +12623,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 12594 "Photo.c"
+#line 12625 "Photo.c"
 	}
 #line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = list;
@@ -12614,7 +12645,7 @@ 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 12616 "Photo.c"
+#line 12647 "Photo.c"
 		PhotoReimportEditableStateImpl* _tmp47_ = NULL;
 		PhotoMetadata* _tmp48_ = NULL;
 #line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12623,13 +12654,13 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 		_tmp48_ = _tmp47_->metadata;
 #line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_baseline_reimported (self, _tmp48_);
-#line 12625 "Photo.c"
+#line 12656 "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 12631 "Photo.c"
+#line 12662 "Photo.c"
 		PhotoReimportEditableStateImpl* _tmp50_ = NULL;
 		PhotoMetadata* _tmp51_ = NULL;
 #line 1605 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12638,20 +12669,20 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 		_tmp51_ = _tmp50_->metadata;
 #line 1605 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_source_reimported (self, _tmp51_);
-#line 12640 "Photo.c"
+#line 12671 "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 12646 "Photo.c"
+#line 12677 "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 12653 "Photo.c"
+#line 12684 "Photo.c"
 }
 
 
@@ -12663,10 +12694,10 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 	GeeCollection* _tmp1_ = NULL;
 	PhotoReimportRawDevelopmentStateImpl* reimport_state = NULL;
 	PhotoReimportRawDevelopmentStateImpl* _tmp2_ = NULL;
-	PhotoReimportRawDevelopmentStateImpl* _tmp18_ = NULL;
-	PhotoReimportRawDevelopmentState* _tmp19_ = NULL;
-	PhotoReimportRawDevelopmentStateImpl* _tmp20_ = NULL;
-	gint _tmp21_ = 0;
+	PhotoReimportRawDevelopmentStateImpl* _tmp19_ = NULL;
+	PhotoReimportRawDevelopmentState* _tmp20_ = NULL;
+	PhotoReimportRawDevelopmentStateImpl* _tmp21_ = NULL;
+	gint _tmp22_ = 0;
 	GError * _inner_error_ = NULL;
 #line 1609 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -12690,21 +12721,21 @@ 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 12692 "Photo.c"
+#line 12723 "Photo.c"
 		} else {
 #line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_raw_development_state_unref0 (_vala_state);
-#line 12696 "Photo.c"
+#line 12727 "Photo.c"
 		}
 #line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12700 "Photo.c"
+#line 12731 "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 12706 "Photo.c"
+#line 12737 "Photo.c"
 	{
 		GeeIterator* _file_it = NULL;
 		GeeCollection* _tmp3_ = NULL;
@@ -12717,7 +12748,7 @@ 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 12719 "Photo.c"
+#line 12750 "Photo.c"
 			GeeIterator* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
 			GFile* file = NULL;
@@ -12730,10 +12761,10 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 			BackingPhotoRow* _tmp11_ = NULL;
 			DetectedPhotoInformation* _tmp12_ = NULL;
 			gboolean _tmp13_ = FALSE;
-			PhotoReimportRawDevelopmentStateImpl* _tmp14_ = NULL;
-			BackingPhotoRow* _tmp15_ = NULL;
-			DetectedPhotoInformation* _tmp16_ = NULL;
-			PhotoMetadata* _tmp17_ = NULL;
+			PhotoReimportRawDevelopmentStateImpl* _tmp15_ = NULL;
+			BackingPhotoRow* _tmp16_ = NULL;
+			DetectedPhotoInformation* _tmp17_ = NULL;
+			PhotoMetadata* _tmp18_ = NULL;
 #line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _file_it;
 #line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12742,7 +12773,7 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 			if (!_tmp6_) {
 #line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 12744 "Photo.c"
+#line 12775 "Photo.c"
 			}
 #line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _file_it;
@@ -12766,6 +12797,8 @@ 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"
+				gboolean _tmp14_ = FALSE;
 #line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
 #line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12781,8 +12814,8 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 #line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (files);
 #line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
-				return FALSE;
-#line 12784 "Photo.c"
+				return _tmp14_;
+#line 12817 "Photo.c"
 			}
 #line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp9_) {
@@ -12794,44 +12827,44 @@ 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 12796 "Photo.c"
+#line 12829 "Photo.c"
 			}
 #line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp14_ = reimport_state;
+			_tmp15_ = reimport_state;
 #line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp15_ = backing;
+			_tmp16_ = backing;
 #line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp16_ = detected;
+			_tmp17_ = detected;
 #line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp17_ = _tmp16_->metadata;
+			_tmp18_ = _tmp17_->metadata;
 #line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
-			photo_reimport_raw_development_state_impl_add (_tmp14_, _tmp15_, _tmp17_);
+			photo_reimport_raw_development_state_impl_add (_tmp15_, _tmp16_, _tmp18_);
 #line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing);
 #line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
 #line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 12814 "Photo.c"
+#line 12847 "Photo.c"
 		}
 #line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_file_it);
-#line 12818 "Photo.c"
+#line 12851 "Photo.c"
 	}
 #line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp18_ = reimport_state;
+	_tmp19_ = reimport_state;
 #line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp19_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState));
+	_tmp20_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState));
 #line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_raw_development_state_unref0 (_vala_state);
 #line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_state = _tmp19_;
+	_vala_state = _tmp20_;
 #line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp20_ = reimport_state;
+	_tmp21_ = reimport_state;
 #line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp21_ = photo_reimport_raw_development_state_impl_get_size (_tmp20_);
+	_tmp22_ = photo_reimport_raw_development_state_impl_get_size (_tmp21_);
 #line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
-	result = _tmp21_ > 0;
+	result = _tmp22_ > 0;
 #line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_raw_development_state_unref0 (reimport_state);
 #line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12840,15 +12873,15 @@ 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 12842 "Photo.c"
+#line 12875 "Photo.c"
 	} else {
 #line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_raw_development_state_unref0 (_vala_state);
-#line 12846 "Photo.c"
+#line 12879 "Photo.c"
 	}
 #line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 12850 "Photo.c"
+#line 12883 "Photo.c"
 }
 
 
@@ -12875,7 +12908,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 12877 "Photo.c"
+#line 12910 "Photo.c"
 	}
 #line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = state;
@@ -12883,7 +12916,7 @@ 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 12885 "Photo.c"
+#line 12918 "Photo.c"
 	{
 		GeeIterator* _dev_it = NULL;
 		PhotoReimportRawDevelopmentStateImpl* _tmp3_ = NULL;
@@ -12899,7 +12932,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 		_dev_it = _tmp5_;
 #line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 12901 "Photo.c"
+#line 12934 "Photo.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			PhotoReimportRawDevelopmentStateImplDevToReimport* dev = NULL;
@@ -12915,7 +12948,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 			if (!_tmp7_) {
 #line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 12917 "Photo.c"
+#line 12950 "Photo.c"
 			}
 #line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _dev_it;
@@ -12929,7 +12962,7 @@ 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 12931 "Photo.c"
+#line 12964 "Photo.c"
 				BackingPhotoTable* _tmp12_ = NULL;
 				BackingPhotoTable* _tmp13_ = NULL;
 				PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp14_ = NULL;
@@ -12960,7 +12993,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 12962 "Photo.c"
+#line 12995 "Photo.c"
 					} else {
 #line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
@@ -12974,7 +13007,7 @@ 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 12976 "Photo.c"
+#line 13009 "Photo.c"
 					}
 				}
 				{
@@ -12983,13 +13016,13 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 					_tmp16_ = self->row;
 #line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_row);
-#line 12985 "Photo.c"
+#line 13018 "Photo.c"
 					{
 						gint _tmp17_ = 0;
 						RawDeveloper* _tmp18_ = NULL;
 #line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp18_ = raw_developer_as_array (&_tmp17_);
-#line 12991 "Photo.c"
+#line 13024 "Photo.c"
 						{
 							RawDeveloper* d_collection = NULL;
 							gint d_collection_length1 = 0;
@@ -13001,11 +13034,11 @@ 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 13003 "Photo.c"
+#line 13036 "Photo.c"
 								RawDeveloper d = 0;
 #line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
 								d = d_collection[d_it];
-#line 13007 "Photo.c"
+#line 13040 "Photo.c"
 								{
 									BackingPhotoID id = {0};
 									PhotoRow* _tmp19_ = NULL;
@@ -13033,7 +13066,7 @@ 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 13035 "Photo.c"
+#line 13068 "Photo.c"
 										BackingPhotoRow* bpr = NULL;
 										BackingPhotoID _tmp25_ = {0};
 										BackingPhotoRow* _tmp26_ = NULL;
@@ -13048,7 +13081,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 										_tmp27_ = bpr;
 #line 1648 "/home/jens/Source/shotwell/src/Photo.vala"
 										if (_tmp27_ != NULL) {
-#line 13050 "Photo.c"
+#line 13083 "Photo.c"
 											GeeHashMap* _tmp28_ = NULL;
 											RawDeveloper _tmp29_ = 0;
 											BackingPhotoRow* _tmp30_ = NULL;
@@ -13060,17 +13093,17 @@ 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 13062 "Photo.c"
+#line 13095 "Photo.c"
 										}
 #line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
 										_backing_photo_row_unref0 (bpr);
-#line 13066 "Photo.c"
+#line 13099 "Photo.c"
 									}
 								}
 							}
 #line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
 							d_collection = (g_free (d_collection), NULL);
-#line 13072 "Photo.c"
+#line 13105 "Photo.c"
 						}
 					}
 					__finally307:
@@ -13080,7 +13113,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 						_tmp31_ = self->row;
 #line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13082 "Photo.c"
+#line 13115 "Photo.c"
 					}
 #line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -13096,7 +13129,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 13098 "Photo.c"
+#line 13131 "Photo.c"
 						} else {
 #line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
@@ -13110,18 +13143,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 13112 "Photo.c"
+#line 13145 "Photo.c"
 						}
 					}
 				}
 			}
 #line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
-#line 13119 "Photo.c"
+#line 13152 "Photo.c"
 		}
 #line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_dev_it);
-#line 13123 "Photo.c"
+#line 13156 "Photo.c"
 	}
 #line 1656 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time");
@@ -13133,7 +13166,7 @@ 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 13135 "Photo.c"
+#line 13168 "Photo.c"
 		const gchar* _tmp35_ = NULL;
 		gchar* _tmp36_ = NULL;
 #line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13144,7 +13177,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 13146 "Photo.c"
+#line 13179 "Photo.c"
 	}
 #line 1660 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = list;
@@ -13162,7 +13195,7 @@ 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 13164 "Photo.c"
+#line 13197 "Photo.c"
 }
 
 
@@ -13178,7 +13211,7 @@ static gchar* photo_real_get_typename (DataSource* base) {
 	result = _tmp0_;
 #line 1666 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13180 "Photo.c"
+#line 13213 "Photo.c"
 }
 
 
@@ -13197,7 +13230,7 @@ static gint64 photo_real_get_instance_id (DataSource* base) {
 	result = _tmp1_;
 #line 1670 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13199 "Photo.c"
+#line 13232 "Photo.c"
 }
 
 
@@ -13227,7 +13260,7 @@ static gchar* photo_real_get_source_id (DataSource* base) {
 	result = _tmp4_;
 #line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13229 "Photo.c"
+#line 13262 "Photo.c"
 }
 
 
@@ -13247,7 +13280,7 @@ 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 13249 "Photo.c"
+#line 13282 "Photo.c"
 	{
 		{
 			PhotoRow* _tmp2_ = NULL;
@@ -13255,7 +13288,7 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 			_tmp2_ = self->row;
 #line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 13257 "Photo.c"
+#line 13290 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 				BackingPhotoRow* _tmp4_ = NULL;
@@ -13284,18 +13317,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 13286 "Photo.c"
+#line 13319 "Photo.c"
 					{
 						PhotoRow* _tmp8_ = NULL;
 #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 13293 "Photo.c"
+#line 13326 "Photo.c"
 					}
 #line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 13297 "Photo.c"
+#line 13330 "Photo.c"
 				}
 #line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = photo_table_get_instance ();
@@ -13315,7 +13348,7 @@ 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 13317 "Photo.c"
+#line 13350 "Photo.c"
 					goto __finally309;
 				}
 #line 1690 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13328,7 +13361,7 @@ 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 13330 "Photo.c"
+#line 13363 "Photo.c"
 			}
 			__finally309:
 			{
@@ -13337,13 +13370,13 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 				_tmp19_ = self->row;
 #line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13339 "Photo.c"
+#line 13372 "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 13345 "Photo.c"
+#line 13378 "Photo.c"
 					goto __catch308_database_error;
 				}
 #line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13352,7 +13385,7 @@ 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 13354 "Photo.c"
+#line 13387 "Photo.c"
 			}
 		}
 	}
@@ -13373,7 +13406,7 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 		_g_error_free0 (err);
 #line 1695 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 13375 "Photo.c"
+#line 13408 "Photo.c"
 	}
 	__finally308:
 #line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13384,13 +13417,13 @@ 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 13386 "Photo.c"
+#line 13419 "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 13392 "Photo.c"
+#line 13425 "Photo.c"
 		Alteration* _tmp22_ = NULL;
 		Alteration* _tmp23_ = NULL;
 #line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13401,7 +13434,7 @@ 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 13403 "Photo.c"
+#line 13436 "Photo.c"
 	} else {
 		Alteration* _tmp24_ = NULL;
 		Alteration* _tmp25_ = NULL;
@@ -13413,7 +13446,7 @@ 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 13415 "Photo.c"
+#line 13448 "Photo.c"
 	}
 }
 
@@ -13437,14 +13470,14 @@ 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 13439 "Photo.c"
+#line 13472 "Photo.c"
 	{
 		PhotoRow* _tmp2_ = NULL;
 #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 13446 "Photo.c"
+#line 13479 "Photo.c"
 		{
 			gboolean _tmp3_ = FALSE;
 			PhotoRow* _tmp4_ = NULL;
@@ -13455,7 +13488,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 			_tmp5_ = backing_photo_id_is_valid (&_tmp4_->editable_id);
 #line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp5_) {
-#line 13457 "Photo.c"
+#line 13490 "Photo.c"
 				BackingPhotoRow* _tmp6_ = NULL;
 				time_t _tmp7_ = 0;
 				GTimeVal _tmp8_ = {0};
@@ -13470,15 +13503,15 @@ 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 13472 "Photo.c"
+#line 13505 "Photo.c"
 			} else {
 #line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = FALSE;
-#line 13476 "Photo.c"
+#line 13509 "Photo.c"
 			}
 #line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_) {
-#line 13480 "Photo.c"
+#line 13513 "Photo.c"
 				BackingPhotoTable* _tmp10_ = NULL;
 				BackingPhotoTable* _tmp11_ = NULL;
 				PhotoRow* _tmp12_ = NULL;
@@ -13506,7 +13539,7 @@ 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 13508 "Photo.c"
+#line 13541 "Photo.c"
 					goto __finally310;
 				}
 #line 1713 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13519,7 +13552,7 @@ 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 13521 "Photo.c"
+#line 13554 "Photo.c"
 			}
 		}
 		__finally310:
@@ -13529,7 +13562,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 			_tmp19_ = self->row;
 #line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13531 "Photo.c"
+#line 13564 "Photo.c"
 		}
 #line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -13539,7 +13572,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 13541 "Photo.c"
+#line 13574 "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);
@@ -13547,7 +13580,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 13549 "Photo.c"
+#line 13582 "Photo.c"
 			}
 		}
 	}
@@ -13555,7 +13588,7 @@ 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 13557 "Photo.c"
+#line 13590 "Photo.c"
 		Alteration* _tmp21_ = NULL;
 		Alteration* _tmp22_ = NULL;
 #line 1719 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13566,7 +13599,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 13568 "Photo.c"
+#line 13601 "Photo.c"
 	}
 }
 
@@ -13577,7 +13610,7 @@ 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 13579 "Photo.c"
+#line 13612 "Photo.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -13604,7 +13637,7 @@ 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 13606 "Photo.c"
+#line 13639 "Photo.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			Photo* photo = NULL;
@@ -13623,7 +13656,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 			if (!_tmp7_) {
 #line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 13625 "Photo.c"
+#line 13658 "Photo.c"
 			}
 #line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _photo_it;
@@ -13657,7 +13690,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 13659 "Photo.c"
+#line 13692 "Photo.c"
 				} else {
 #line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (photo);
@@ -13669,16 +13702,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 13671 "Photo.c"
+#line 13704 "Photo.c"
 				}
 			}
 #line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 13676 "Photo.c"
+#line 13709 "Photo.c"
 		}
 #line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_photo_it);
-#line 13680 "Photo.c"
+#line 13713 "Photo.c"
 	}
 #line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_commit_transaction (&_inner_error_);
@@ -13690,7 +13723,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 13692 "Photo.c"
+#line 13725 "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);
@@ -13698,7 +13731,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 13700 "Photo.c"
+#line 13733 "Photo.c"
 		}
 	}
 }
@@ -13718,26 +13751,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 13720 "Photo.c"
+#line 13753 "Photo.c"
 		PhotoFileFormat _tmp3_ = 0;
 #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 13726 "Photo.c"
+#line 13759 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp4_ = 0;
 #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 13733 "Photo.c"
+#line 13766 "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 13739 "Photo.c"
+#line 13772 "Photo.c"
 }
 
 
@@ -13766,7 +13799,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 13768 "Photo.c"
+#line 13801 "Photo.c"
 	}
 #line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp0_;
@@ -13778,7 +13811,7 @@ 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 13780 "Photo.c"
+#line 13813 "Photo.c"
 }
 
 
@@ -13797,7 +13830,7 @@ gboolean photo_is_file_image (GFile* file) {
 	if (_tmp2_) {
 #line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = TRUE;
-#line 13799 "Photo.c"
+#line 13832 "Photo.c"
 	} else {
 		GFile* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
@@ -13815,13 +13848,13 @@ gboolean photo_is_file_image (GFile* file) {
 		_tmp0_ = _tmp6_;
 #line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp5_);
-#line 13817 "Photo.c"
+#line 13850 "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 13823 "Photo.c"
+#line 13856 "Photo.c"
 }
 
 
@@ -13863,7 +13896,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 13865 "Photo.c"
+#line 13898 "Photo.c"
 	}
 #line 1755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = ext;
@@ -13877,7 +13910,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 13879 "Photo.c"
+#line 13912 "Photo.c"
 	{
 		gchar** extension_collection = NULL;
 		gint extension_collection_length1 = 0;
@@ -13889,14 +13922,14 @@ 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 13891 "Photo.c"
+#line 13924 "Photo.c"
 			gchar* _tmp7_ = NULL;
 			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 13898 "Photo.c"
+#line 13931 "Photo.c"
 			{
 				const gchar* _tmp8_ = NULL;
 				const gchar* _tmp9_ = NULL;
@@ -13916,11 +13949,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 13918 "Photo.c"
+#line 13951 "Photo.c"
 				}
 #line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (extension);
-#line 13922 "Photo.c"
+#line 13955 "Photo.c"
 			}
 		}
 	}
@@ -13932,7 +13965,7 @@ 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 13934 "Photo.c"
+#line 13967 "Photo.c"
 }
 
 
@@ -13970,7 +14003,7 @@ 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 13972 "Photo.c"
+#line 14005 "Photo.c"
 }
 
 
@@ -14018,13 +14051,13 @@ 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 14020 "Photo.c"
+#line 14053 "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 14026 "Photo.c"
+#line 14059 "Photo.c"
 }
 
 
@@ -14045,7 +14078,7 @@ gint64 photo_get_photo_key (DataSource* source) {
 	result = _tmp2_;
 #line 1789 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 14047 "Photo.c"
+#line 14080 "Photo.c"
 }
 
 
@@ -14072,7 +14105,7 @@ static GFile* photo_real_get_file (MediaSource* base) {
 	result = _tmp3_;
 #line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 14074 "Photo.c"
+#line 14107 "Photo.c"
 }
 
 
@@ -14083,13 +14116,13 @@ static void _vala_array_add96 (gchar*** array, int* length, int* size, gchar* va
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14085 "Photo.c"
+#line 14118 "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 14091 "Photo.c"
+#line 14124 "Photo.c"
 }
 
 
@@ -14100,13 +14133,13 @@ static void _vala_array_add97 (gchar*** array, int* length, int* size, gchar* va
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14102 "Photo.c"
+#line 14135 "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 14108 "Photo.c"
+#line 14141 "Photo.c"
 }
 
 
@@ -14117,13 +14150,13 @@ static void _vala_array_add98 (gchar*** array, int* length, int* size, gchar* va
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14119 "Photo.c"
+#line 14152 "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 14125 "Photo.c"
+#line 14158 "Photo.c"
 }
 
 
@@ -14134,13 +14167,13 @@ static void _vala_array_add99 (gchar*** array, int* length, int* size, gchar* va
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14136 "Photo.c"
+#line 14169 "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 14142 "Photo.c"
+#line 14175 "Photo.c"
 }
 
 
@@ -14175,7 +14208,7 @@ 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 14177 "Photo.c"
+#line 14210 "Photo.c"
 	{
 		{
 			PhotoRow* _tmp2_ = NULL;
@@ -14183,7 +14216,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 			_tmp2_ = self->row;
 #line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 14185 "Photo.c"
+#line 14218 "Photo.c"
 			{
 				{
 					PhotoBackingReaders* _tmp3_ = NULL;
@@ -14191,7 +14224,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 					_tmp3_ = self->priv->readers;
 #line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 14193 "Photo.c"
+#line 14226 "Photo.c"
 					{
 						PhotoBackingReaders* _tmp4_ = NULL;
 						PhotoFileReader* _tmp5_ = NULL;
@@ -14217,7 +14250,7 @@ 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 14219 "Photo.c"
+#line 14252 "Photo.c"
 							PhotoTable* _tmp10_ = NULL;
 							PhotoTable* _tmp11_ = NULL;
 							PhotoID _tmp12_ = {0};
@@ -14254,7 +14287,7 @@ 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 14256 "Photo.c"
+#line 14289 "Photo.c"
 								goto __finally313;
 							}
 #line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14311,7 +14344,7 @@ 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 14313 "Photo.c"
+#line 14346 "Photo.c"
 								GFile* _tmp32_ = NULL;
 								gchar* _tmp33_ = NULL;
 								gchar* _tmp34_ = NULL;
@@ -14336,15 +14369,15 @@ 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 14338 "Photo.c"
+#line 14371 "Photo.c"
 							} else {
 #line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp28_ = FALSE;
-#line 14342 "Photo.c"
+#line 14375 "Photo.c"
 							}
 #line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
 							name_changed = _tmp28_;
-#line 14346 "Photo.c"
+#line 14379 "Photo.c"
 						}
 					}
 					__finally313:
@@ -14354,11 +14387,11 @@ void photo_set_master_file (Photo* self, GFile* file) {
 						_tmp38_ = self->priv->readers;
 #line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 14356 "Photo.c"
+#line 14389 "Photo.c"
 					}
 #line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14360 "Photo.c"
+#line 14393 "Photo.c"
 						goto __finally312;
 					}
 				}
@@ -14370,13 +14403,13 @@ void photo_set_master_file (Photo* self, GFile* file) {
 				_tmp39_ = self->row;
 #line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 14372 "Photo.c"
+#line 14405 "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 14378 "Photo.c"
+#line 14411 "Photo.c"
 					goto __catch311_database_error;
 				}
 #line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14389,7 +14422,7 @@ 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 14391 "Photo.c"
+#line 14424 "Photo.c"
 			}
 		}
 	}
@@ -14408,7 +14441,7 @@ 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 14410 "Photo.c"
+#line 14443 "Photo.c"
 	}
 	__finally311:
 #line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14423,13 +14456,13 @@ 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 14425 "Photo.c"
+#line 14458 "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 14431 "Photo.c"
+#line 14464 "Photo.c"
 		GFile* _tmp42_ = NULL;
 		GFile* _tmp43_ = NULL;
 		gboolean _tmp44_ = FALSE;
@@ -14459,7 +14492,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 14461 "Photo.c"
+#line 14494 "Photo.c"
 		}
 #line 1850 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = g_new0 (gchar*, 0 + 1);
@@ -14481,7 +14514,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 		_tmp48_ = name_changed;
 #line 1855 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp48_) {
-#line 14483 "Photo.c"
+#line 14516 "Photo.c"
 			gchar** _tmp49_ = NULL;
 			gint _tmp49__length1 = 0;
 			gchar* _tmp50_ = NULL;
@@ -14493,13 +14526,13 @@ 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 14495 "Photo.c"
+#line 14528 "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 14501 "Photo.c"
+#line 14534 "Photo.c"
 			gchar** _tmp52_ = NULL;
 			gint _tmp52__length1 = 0;
 			gchar* _tmp53_ = NULL;
@@ -14511,13 +14544,13 @@ 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 14513 "Photo.c"
+#line 14546 "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 14519 "Photo.c"
+#line 14552 "Photo.c"
 			gchar** _tmp55_ = NULL;
 			gint _tmp55__length1 = 0;
 			gchar* _tmp56_ = NULL;
@@ -14529,7 +14562,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 14531 "Photo.c"
+#line 14564 "Photo.c"
 		}
 #line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57_ = alteration_list;
@@ -14545,13 +14578,13 @@ 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 14547 "Photo.c"
+#line 14580 "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 14553 "Photo.c"
+#line 14586 "Photo.c"
 }
 
 
@@ -14562,13 +14595,13 @@ static void _vala_array_add100 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14564 "Photo.c"
+#line 14597 "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 14570 "Photo.c"
+#line 14603 "Photo.c"
 }
 
 
@@ -14579,13 +14612,13 @@ static void _vala_array_add101 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14581 "Photo.c"
+#line 14614 "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 14587 "Photo.c"
+#line 14620 "Photo.c"
 }
 
 
@@ -14596,13 +14629,13 @@ static void _vala_array_add102 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14598 "Photo.c"
+#line 14631 "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 14604 "Photo.c"
+#line 14637 "Photo.c"
 }
 
 
@@ -14634,7 +14667,7 @@ 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 14636 "Photo.c"
+#line 14669 "Photo.c"
 	{
 		{
 			PhotoRow* _tmp2_ = NULL;
@@ -14642,7 +14675,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 			_tmp2_ = self->row;
 #line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 14644 "Photo.c"
+#line 14677 "Photo.c"
 			{
 				{
 					PhotoBackingReaders* _tmp3_ = NULL;
@@ -14650,7 +14683,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 					_tmp3_ = self->priv->readers;
 #line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 14652 "Photo.c"
+#line 14685 "Photo.c"
 					{
 						GFile* _tmp4_ = NULL;
 						PhotoBackingReaders* _tmp5_ = NULL;
@@ -14664,7 +14697,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 						_tmp6_ = _tmp5_->editable;
 #line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp6_ != NULL) {
-#line 14666 "Photo.c"
+#line 14699 "Photo.c"
 							PhotoBackingReaders* _tmp7_ = NULL;
 							PhotoFileReader* _tmp8_ = NULL;
 							GFile* _tmp9_ = NULL;
@@ -14678,13 +14711,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 14680 "Photo.c"
+#line 14713 "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 14686 "Photo.c"
+#line 14719 "Photo.c"
 						}
 #line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp10_ = _g_object_ref0 (_tmp4_);
@@ -14696,7 +14729,7 @@ 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 14698 "Photo.c"
+#line 14731 "Photo.c"
 							GFile* _tmp13_ = NULL;
 							GFile* _tmp14_ = NULL;
 							gboolean _tmp15_ = FALSE;
@@ -14708,15 +14741,15 @@ 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 14710 "Photo.c"
+#line 14743 "Photo.c"
 						} else {
 #line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp11_ = FALSE;
-#line 14714 "Photo.c"
+#line 14747 "Photo.c"
 						}
 #line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp11_) {
-#line 14718 "Photo.c"
+#line 14751 "Photo.c"
 							BackingPhotoTable* _tmp16_ = NULL;
 							BackingPhotoTable* _tmp17_ = NULL;
 							PhotoRow* _tmp18_ = NULL;
@@ -14750,7 +14783,7 @@ 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 14752 "Photo.c"
+#line 14785 "Photo.c"
 								goto __finally316;
 							}
 #line 1884 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14787,11 +14820,11 @@ 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 14789 "Photo.c"
+#line 14822 "Photo.c"
 						}
 #line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_tmp4_);
-#line 14793 "Photo.c"
+#line 14826 "Photo.c"
 					}
 					__finally316:
 					{
@@ -14800,11 +14833,11 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 						_tmp31_ = self->priv->readers;
 #line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 14802 "Photo.c"
+#line 14835 "Photo.c"
 					}
 #line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14806 "Photo.c"
+#line 14839 "Photo.c"
 						goto __finally315;
 					}
 				}
@@ -14816,13 +14849,13 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 				_tmp32_ = self->row;
 #line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 14818 "Photo.c"
+#line 14851 "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 14824 "Photo.c"
+#line 14857 "Photo.c"
 					goto __catch314_database_error;
 				}
 #line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14835,7 +14868,7 @@ 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 14837 "Photo.c"
+#line 14870 "Photo.c"
 			}
 		}
 	}
@@ -14854,7 +14887,7 @@ 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 14856 "Photo.c"
+#line 14889 "Photo.c"
 	}
 	__finally314:
 #line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14869,13 +14902,13 @@ 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 14871 "Photo.c"
+#line 14904 "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 14877 "Photo.c"
+#line 14910 "Photo.c"
 		GFile* _tmp35_ = NULL;
 		GFile* _tmp36_ = NULL;
 		gboolean _tmp37_ = FALSE;
@@ -14904,7 +14937,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 14906 "Photo.c"
+#line 14939 "Photo.c"
 		}
 #line 1903 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = g_new0 (gchar*, 0 + 1);
@@ -14926,7 +14959,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 		_tmp41_ = is_baseline;
 #line 1906 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp41_) {
-#line 14928 "Photo.c"
+#line 14961 "Photo.c"
 			gchar** _tmp42_ = NULL;
 			gint _tmp42__length1 = 0;
 			gchar* _tmp43_ = NULL;
@@ -14938,13 +14971,13 @@ 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 14940 "Photo.c"
+#line 14973 "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 14946 "Photo.c"
+#line 14979 "Photo.c"
 			gchar** _tmp45_ = NULL;
 			gint _tmp45__length1 = 0;
 			gchar* _tmp46_ = NULL;
@@ -14956,7 +14989,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 14958 "Photo.c"
+#line 14991 "Photo.c"
 		}
 #line 1912 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = alteration_list;
@@ -14972,13 +15005,13 @@ 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 14974 "Photo.c"
+#line 15007 "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 14980 "Photo.c"
+#line 15013 "Photo.c"
 }
 
 
@@ -14999,7 +15032,7 @@ 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 15001 "Photo.c"
+#line 15034 "Photo.c"
 		GeeMapIterator* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		GeeMapIterator* _tmp4_ = NULL;
@@ -15016,7 +15049,7 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
 		if (!_tmp3_) {
 #line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 15018 "Photo.c"
+#line 15051 "Photo.c"
 		}
 #line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = map_iter;
@@ -15036,7 +15069,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 15038 "Photo.c"
+#line 15071 "Photo.c"
 	}
 #line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_commit_transaction (&_inner_error_);
@@ -15050,7 +15083,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 15052 "Photo.c"
+#line 15085 "Photo.c"
 		} else {
 #line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (map_iter);
@@ -15060,12 +15093,12 @@ 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 15062 "Photo.c"
+#line 15095 "Photo.c"
 		}
 	}
 #line 1917 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (map_iter);
-#line 15067 "Photo.c"
+#line 15100 "Photo.c"
 }
 
 
@@ -15091,7 +15124,7 @@ GFile* photo_get_actual_file (Photo* self) {
 	result = _tmp3_;
 #line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15093 "Photo.c"
+#line 15126 "Photo.c"
 }
 
 
@@ -15118,7 +15151,7 @@ static GFile* photo_real_get_master_file (MediaSource* base) {
 	result = _tmp3_;
 #line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15120 "Photo.c"
+#line 15153 "Photo.c"
 }
 
 
@@ -15138,7 +15171,7 @@ GFile* photo_get_editable_file (Photo* self) {
 	_tmp2_ = reader;
 #line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 15140 "Photo.c"
+#line 15173 "Photo.c"
 		PhotoFileReader* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
 #line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15149,13 +15182,13 @@ GFile* photo_get_editable_file (Photo* self) {
 		_g_object_unref0 (_tmp1_);
 #line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp4_;
-#line 15151 "Photo.c"
+#line 15184 "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 15157 "Photo.c"
+#line 15190 "Photo.c"
 	}
 #line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
@@ -15163,7 +15196,7 @@ GFile* photo_get_editable_file (Photo* self) {
 	_photo_file_adapter_unref0 (reader);
 #line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15165 "Photo.c"
+#line 15198 "Photo.c"
 }
 
 
@@ -15183,20 +15216,20 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 		result = NULL;
 #line 1945 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 15185 "Photo.c"
+#line 15218 "Photo.c"
 	}
 #line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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 15191 "Photo.c"
+#line 15224 "Photo.c"
 	{
 		PhotoRow* _tmp2_ = NULL;
 #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 15198 "Photo.c"
+#line 15231 "Photo.c"
 		{
 			{
 				GeeIterator* _row_it = NULL;
@@ -15209,7 +15242,7 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 #line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->developments;
 #line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MAP, GeeMap));
+				_tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_;
 #line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15224,7 +15257,7 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 				_row_it = _tmp8_;
 #line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				while (TRUE) {
-#line 15226 "Photo.c"
+#line 15259 "Photo.c"
 					GeeIterator* _tmp9_ = NULL;
 					gboolean _tmp10_ = FALSE;
 					BackingPhotoRow* row = NULL;
@@ -15243,7 +15276,7 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 					if (!_tmp10_) {
 #line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 						break;
-#line 15245 "Photo.c"
+#line 15278 "Photo.c"
 					}
 #line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = _row_it;
@@ -15267,11 +15300,11 @@ 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 15269 "Photo.c"
+#line 15302 "Photo.c"
 				}
 #line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_row_it);
-#line 15273 "Photo.c"
+#line 15306 "Photo.c"
 			}
 		}
 		__finally317:
@@ -15281,7 +15314,7 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 			_tmp18_ = self->row;
 #line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15283 "Photo.c"
+#line 15316 "Photo.c"
 		}
 #line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -15293,14 +15326,14 @@ 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 15295 "Photo.c"
+#line 15328 "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 15302 "Photo.c"
+#line 15335 "Photo.c"
 }
 
 
@@ -15326,7 +15359,7 @@ GFile* photo_get_source_file (Photo* self) {
 	result = _tmp3_;
 #line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15328 "Photo.c"
+#line 15361 "Photo.c"
 }
 
 
@@ -15335,14 +15368,14 @@ 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 15337 "Photo.c"
+#line 15370 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 15344 "Photo.c"
+#line 15377 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			PhotoFileFormat _tmp2_ = 0;
@@ -15352,18 +15385,18 @@ PhotoFileFormat photo_get_file_format (Photo* self) {
 			_tmp2_ = _tmp1_->file_format;
 #line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 15354 "Photo.c"
+#line 15387 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #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 15361 "Photo.c"
+#line 15394 "Photo.c"
 			}
 #line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15365 "Photo.c"
+#line 15398 "Photo.c"
 		}
 		__finally318:
 		{
@@ -15372,7 +15405,7 @@ PhotoFileFormat photo_get_file_format (Photo* self) {
 			_tmp4_ = self->row;
 #line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15374 "Photo.c"
+#line 15407 "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);
@@ -15380,7 +15413,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 15382 "Photo.c"
+#line 15415 "Photo.c"
 	}
 }
 
@@ -15403,19 +15436,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 15405 "Photo.c"
+#line 15438 "Photo.c"
 		PhotoFileFormat _tmp3_ = 0;
 #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 15411 "Photo.c"
+#line 15444 "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 15417 "Photo.c"
+#line 15450 "Photo.c"
 }
 
 
@@ -15424,14 +15457,14 @@ 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 15426 "Photo.c"
+#line 15459 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 15433 "Photo.c"
+#line 15466 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -15444,18 +15477,18 @@ 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 15446 "Photo.c"
+#line 15479 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
 #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 15453 "Photo.c"
+#line 15486 "Photo.c"
 			}
 #line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15457 "Photo.c"
+#line 15490 "Photo.c"
 		}
 		__finally319:
 		{
@@ -15464,7 +15497,7 @@ PhotoFileFormat photo_get_master_file_format (Photo* self) {
 			_tmp5_ = self->row;
 #line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15466 "Photo.c"
+#line 15499 "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);
@@ -15472,7 +15505,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 15474 "Photo.c"
+#line 15507 "Photo.c"
 	}
 }
 
@@ -15483,14 +15516,15 @@ 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 15485 "Photo.c"
+#line 15518 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
+		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 15492 "Photo.c"
+#line 15526 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			time_t _tmp2_ = 0;
@@ -15500,18 +15534,18 @@ static time_t photo_real_get_timestamp (MediaSource* base) {
 			_tmp2_ = _tmp1_->timestamp;
 #line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 15502 "Photo.c"
+#line 15536 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #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 15509 "Photo.c"
+#line 15543 "Photo.c"
 			}
 #line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15513 "Photo.c"
+#line 15547 "Photo.c"
 		}
 		__finally320:
 		{
@@ -15520,15 +15554,15 @@ static time_t photo_real_get_timestamp (MediaSource* base) {
 			_tmp4_ = self->row;
 #line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15522 "Photo.c"
+#line 15556 "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);
 #line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
-		return 0;
-#line 15530 "Photo.c"
+		return _tmp5_;
+#line 15564 "Photo.c"
 	}
 }
 
@@ -15537,14 +15571,14 @@ 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 15539 "Photo.c"
+#line 15573 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 15546 "Photo.c"
+#line 15580 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			PhotoID _tmp2_ = {0};
@@ -15554,18 +15588,18 @@ void photo_get_photo_id (Photo* self, PhotoID* result) {
 			_tmp2_ = _tmp1_->photo_id;
 #line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 15556 "Photo.c"
+#line 15590 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #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 15563 "Photo.c"
+#line 15597 "Photo.c"
 			}
 #line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15567 "Photo.c"
+#line 15601 "Photo.c"
 		}
 		__finally321:
 		{
@@ -15574,7 +15608,7 @@ void photo_get_photo_id (Photo* self, PhotoID* result) {
 			_tmp4_ = self->row;
 #line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15576 "Photo.c"
+#line 15610 "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);
@@ -15582,7 +15616,7 @@ 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 15584 "Photo.c"
+#line 15618 "Photo.c"
 	}
 }
 
@@ -15601,7 +15635,7 @@ 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 15603 "Photo.c"
+#line 15637 "Photo.c"
 }
 
 
@@ -15622,7 +15656,7 @@ inline gint64 photo_get_raw_event_id (Photo* self) {
 	result = _tmp2_;
 #line 1999 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15624 "Photo.c"
+#line 15658 "Photo.c"
 }
 
 
@@ -15631,14 +15665,14 @@ 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 15633 "Photo.c"
+#line 15667 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 15640 "Photo.c"
+#line 15674 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			ImportID _tmp2_ = {0};
@@ -15648,18 +15682,18 @@ static void photo_real_get_import_id (MediaSource* base, ImportID* result) {
 			_tmp2_ = _tmp1_->import_id;
 #line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 15650 "Photo.c"
+#line 15684 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #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 15657 "Photo.c"
+#line 15691 "Photo.c"
 			}
 #line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15661 "Photo.c"
+#line 15695 "Photo.c"
 		}
 		__finally322:
 		{
@@ -15668,7 +15702,7 @@ static void photo_real_get_import_id (MediaSource* base, ImportID* result) {
 			_tmp4_ = self->row;
 #line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15670 "Photo.c"
+#line 15704 "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);
@@ -15676,7 +15710,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 15678 "Photo.c"
+#line 15712 "Photo.c"
 	}
 }
 
@@ -15685,14 +15719,14 @@ 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 15687 "Photo.c"
+#line 15721 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 15694 "Photo.c"
+#line 15728 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			BackingPhotoID _tmp2_ = {0};
@@ -15702,18 +15736,18 @@ void photo_get_editable_id (Photo* self, BackingPhotoID* result) {
 			_tmp2_ = _tmp1_->editable_id;
 #line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 15704 "Photo.c"
+#line 15738 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #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 15711 "Photo.c"
+#line 15745 "Photo.c"
 			}
 #line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15715 "Photo.c"
+#line 15749 "Photo.c"
 		}
 		__finally323:
 		{
@@ -15722,7 +15756,7 @@ void photo_get_editable_id (Photo* self, BackingPhotoID* result) {
 			_tmp4_ = self->row;
 #line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15724 "Photo.c"
+#line 15758 "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);
@@ -15730,7 +15764,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 15732 "Photo.c"
+#line 15766 "Photo.c"
 	}
 }
 
@@ -15741,14 +15775,14 @@ 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 15743 "Photo.c"
+#line 15777 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 15750 "Photo.c"
+#line 15784 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
@@ -15761,18 +15795,18 @@ 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 15763 "Photo.c"
+#line 15797 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
 #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 15770 "Photo.c"
+#line 15804 "Photo.c"
 			}
 #line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15774 "Photo.c"
+#line 15808 "Photo.c"
 		}
 		__finally324:
 		{
@@ -15781,7 +15815,7 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) {
 			_tmp5_ = self->row;
 #line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15783 "Photo.c"
+#line 15817 "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);
@@ -15789,7 +15823,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 15791 "Photo.c"
+#line 15825 "Photo.c"
 	}
 }
 
@@ -15799,14 +15833,15 @@ 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 15801 "Photo.c"
+#line 15835 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
+		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 15808 "Photo.c"
+#line 15843 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -15816,18 +15851,18 @@ guint64 photo_get_flags (Photo* self) {
 			_tmp2_ = _tmp1_->flags;
 #line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 15818 "Photo.c"
+#line 15853 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #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 15825 "Photo.c"
+#line 15860 "Photo.c"
 			}
 #line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15829 "Photo.c"
+#line 15864 "Photo.c"
 		}
 		__finally325:
 		{
@@ -15836,15 +15871,15 @@ guint64 photo_get_flags (Photo* self) {
 			_tmp4_ = self->row;
 #line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15838 "Photo.c"
+#line 15873 "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);
 #line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
-		return 0ULL;
-#line 15846 "Photo.c"
+		return _tmp5_;
+#line 15881 "Photo.c"
 	}
 }
 
@@ -15866,7 +15901,7 @@ 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 15868 "Photo.c"
+#line 15903 "Photo.c"
 		Alteration* _tmp2_ = NULL;
 		Alteration* _tmp3_ = NULL;
 		Alteration* _tmp4_ = NULL;
@@ -15880,7 +15915,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 15882 "Photo.c"
+#line 15917 "Photo.c"
 	}
 #line 2033 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = alteration;
@@ -15888,28 +15923,28 @@ 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 15890 "Photo.c"
+#line 15925 "Photo.c"
 }
 
 
 guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_alteration) {
 	guint64 result = 0ULL;
 	gboolean committed = FALSE;
-	gboolean _tmp10_ = FALSE;
-	guint64 _tmp12_ = 0ULL;
+	gboolean _tmp11_ = FALSE;
+	guint64 _tmp13_ = 0ULL;
 	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 15904 "Photo.c"
+#line 15939 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 15911 "Photo.c"
+#line 15946 "Photo.c"
 		{
 			PhotoTable* _tmp1_ = NULL;
 			PhotoTable* _tmp2_ = NULL;
@@ -15935,7 +15970,7 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_
 			_tmp6_ = committed;
 #line 2040 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_) {
-#line 15937 "Photo.c"
+#line 15972 "Photo.c"
 				PhotoRow* _tmp7_ = NULL;
 				guint64 _tmp8_ = 0ULL;
 #line 2041 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15944,7 +15979,7 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_
 				_tmp8_ = flags;
 #line 2041 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_->flags = _tmp8_;
-#line 15946 "Photo.c"
+#line 15981 "Photo.c"
 			}
 		}
 		__finally326:
@@ -15954,38 +15989,40 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_
 			_tmp9_ = self->row;
 #line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15956 "Photo.c"
+#line 15991 "Photo.c"
 		}
 #line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 15995 "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);
 #line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
 #line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
-			return 0ULL;
-#line 15966 "Photo.c"
+			return _tmp10_;
+#line 16003 "Photo.c"
 		}
 	}
 #line 2044 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp10_ = committed;
+	_tmp11_ = committed;
 #line 2044 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp10_) {
-#line 15973 "Photo.c"
-		Alteration* _tmp11_ = NULL;
+	if (_tmp11_) {
+#line 16010 "Photo.c"
+		Alteration* _tmp12_ = NULL;
 #line 2045 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp11_ = additional_alteration;
+		_tmp12_ = additional_alteration;
 #line 2045 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_notify_flags_altered (self, _tmp11_);
-#line 15979 "Photo.c"
+		photo_notify_flags_altered (self, _tmp12_);
+#line 16016 "Photo.c"
 	}
 #line 2047 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp12_ = flags;
+	_tmp13_ = flags;
 #line 2047 "/home/jens/Source/shotwell/src/Photo.vala"
-	result = _tmp12_;
+	result = _tmp13_;
 #line 2047 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15987 "Photo.c"
+#line 16024 "Photo.c"
 }
 
 
@@ -15994,14 +16031,15 @@ 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 15996 "Photo.c"
+#line 16033 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
+		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 16003 "Photo.c"
+#line 16041 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -16017,18 +16055,18 @@ 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 16019 "Photo.c"
+#line 16057 "Photo.c"
 			{
 				PhotoRow* _tmp5_ = NULL;
 #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 16026 "Photo.c"
+#line 16064 "Photo.c"
 			}
 #line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 16030 "Photo.c"
+#line 16068 "Photo.c"
 		}
 		__finally327:
 		{
@@ -16037,15 +16075,15 @@ gboolean photo_is_flag_set (Photo* self, guint64 mask) {
 			_tmp6_ = self->row;
 #line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16039 "Photo.c"
+#line 16077 "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);
 #line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 16047 "Photo.c"
+		return _tmp7_;
+#line 16085 "Photo.c"
 	}
 }
 
@@ -16054,7 +16092,7 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
 	guint64 result = 0ULL;
 	guint64 flags = 0ULL;
 	gboolean committed = FALSE;
-	gboolean _tmp17_ = FALSE;
+	gboolean _tmp18_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 2056 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
@@ -16064,14 +16102,14 @@ 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 16066 "Photo.c"
+#line 16104 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 16073 "Photo.c"
+#line 16111 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -16098,7 +16136,7 @@ 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 16100 "Photo.c"
+#line 16138 "Photo.c"
 				PhotoTable* _tmp8_ = NULL;
 				PhotoTable* _tmp9_ = NULL;
 				PhotoID _tmp10_ = {0};
@@ -16123,7 +16161,7 @@ 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 16125 "Photo.c"
+#line 16163 "Photo.c"
 					PhotoRow* _tmp14_ = NULL;
 					guint64 _tmp15_ = 0ULL;
 #line 2065 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16132,7 +16170,7 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
 					_tmp15_ = flags;
 #line 2065 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_->flags = _tmp15_;
-#line 16134 "Photo.c"
+#line 16172 "Photo.c"
 				}
 			}
 		}
@@ -16143,36 +16181,38 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
 			_tmp16_ = self->row;
 #line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16145 "Photo.c"
+#line 16183 "Photo.c"
 		}
 #line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 16187 "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);
 #line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
 #line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
-			return 0ULL;
-#line 16155 "Photo.c"
+			return _tmp17_;
+#line 16195 "Photo.c"
 		}
 	}
 #line 2069 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp17_ = committed;
+	_tmp18_ = committed;
 #line 2069 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp17_) {
-#line 16162 "Photo.c"
-		Alteration* _tmp18_ = NULL;
+	if (_tmp18_) {
+#line 16202 "Photo.c"
+		Alteration* _tmp19_ = NULL;
 #line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp18_ = additional_alteration;
+		_tmp19_ = additional_alteration;
 #line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_notify_flags_altered (self, _tmp18_);
-#line 16168 "Photo.c"
+		photo_notify_flags_altered (self, _tmp19_);
+#line 16208 "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 16174 "Photo.c"
+#line 16214 "Photo.c"
 }
 
 
@@ -16180,7 +16220,7 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
 	guint64 result = 0ULL;
 	guint64 flags = 0ULL;
 	gboolean committed = FALSE;
-	gboolean _tmp17_ = FALSE;
+	gboolean _tmp18_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 2075 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
@@ -16190,14 +16230,14 @@ 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 16192 "Photo.c"
+#line 16232 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 16199 "Photo.c"
+#line 16239 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -16224,7 +16264,7 @@ 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 16226 "Photo.c"
+#line 16266 "Photo.c"
 				PhotoTable* _tmp8_ = NULL;
 				PhotoTable* _tmp9_ = NULL;
 				PhotoID _tmp10_ = {0};
@@ -16249,7 +16289,7 @@ 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 16251 "Photo.c"
+#line 16291 "Photo.c"
 					PhotoRow* _tmp14_ = NULL;
 					guint64 _tmp15_ = 0ULL;
 #line 2084 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16258,7 +16298,7 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
 					_tmp15_ = flags;
 #line 2084 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_->flags = _tmp15_;
-#line 16260 "Photo.c"
+#line 16300 "Photo.c"
 				}
 			}
 		}
@@ -16269,36 +16309,38 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
 			_tmp16_ = self->row;
 #line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16271 "Photo.c"
+#line 16311 "Photo.c"
 		}
 #line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 16315 "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);
 #line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
 #line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
-			return 0ULL;
-#line 16281 "Photo.c"
+			return _tmp17_;
+#line 16323 "Photo.c"
 		}
 	}
 #line 2088 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp17_ = committed;
+	_tmp18_ = committed;
 #line 2088 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp17_) {
-#line 16288 "Photo.c"
-		Alteration* _tmp18_ = NULL;
+	if (_tmp18_) {
+#line 16330 "Photo.c"
+		Alteration* _tmp19_ = NULL;
 #line 2089 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp18_ = additional_alteration;
+		_tmp19_ = additional_alteration;
 #line 2089 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_notify_flags_altered (self, _tmp18_);
-#line 16294 "Photo.c"
+		photo_notify_flags_altered (self, _tmp19_);
+#line 16336 "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 16300 "Photo.c"
+#line 16342 "Photo.c"
 }
 
 
@@ -16306,7 +16348,7 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
 	guint64 result = 0ULL;
 	guint64 flags = 0ULL;
 	gboolean committed = FALSE;
-	gboolean _tmp17_ = FALSE;
+	gboolean _tmp18_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 2094 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
@@ -16316,14 +16358,14 @@ 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 16318 "Photo.c"
+#line 16360 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 16325 "Photo.c"
+#line 16367 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -16350,7 +16392,7 @@ 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 16352 "Photo.c"
+#line 16394 "Photo.c"
 				PhotoTable* _tmp8_ = NULL;
 				PhotoTable* _tmp9_ = NULL;
 				PhotoID _tmp10_ = {0};
@@ -16375,7 +16417,7 @@ 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 16377 "Photo.c"
+#line 16419 "Photo.c"
 					PhotoRow* _tmp14_ = NULL;
 					guint64 _tmp15_ = 0ULL;
 #line 2103 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16384,7 +16426,7 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
 					_tmp15_ = flags;
 #line 2103 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_->flags = _tmp15_;
-#line 16386 "Photo.c"
+#line 16428 "Photo.c"
 				}
 			}
 		}
@@ -16395,36 +16437,38 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
 			_tmp16_ = self->row;
 #line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16397 "Photo.c"
+#line 16439 "Photo.c"
 		}
 #line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 16443 "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);
 #line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
 #line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
-			return 0ULL;
-#line 16407 "Photo.c"
+			return _tmp17_;
+#line 16451 "Photo.c"
 		}
 	}
 #line 2107 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp17_ = committed;
+	_tmp18_ = committed;
 #line 2107 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp17_) {
-#line 16414 "Photo.c"
-		Alteration* _tmp18_ = NULL;
+	if (_tmp18_) {
+#line 16458 "Photo.c"
+		Alteration* _tmp19_ = NULL;
 #line 2108 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp18_ = additional_alteration;
+		_tmp19_ = additional_alteration;
 #line 2108 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_notify_flags_altered (self, _tmp18_);
-#line 16420 "Photo.c"
+		photo_notify_flags_altered (self, _tmp19_);
+#line 16464 "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 16426 "Photo.c"
+#line 16470 "Photo.c"
 }
 
 
@@ -16446,7 +16490,7 @@ 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 16448 "Photo.c"
+#line 16492 "Photo.c"
 		{
 			GeeIterator* _photo_it = NULL;
 			GeeCollection* _tmp1_ = NULL;
@@ -16459,7 +16503,7 @@ 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 16461 "Photo.c"
+#line 16505 "Photo.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				Photo* photo = NULL;
@@ -16476,7 +16520,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 16478 "Photo.c"
+#line 16522 "Photo.c"
 				}
 #line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _photo_it;
@@ -16494,18 +16538,18 @@ 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 16496 "Photo.c"
+#line 16540 "Photo.c"
 			}
 #line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_photo_it);
-#line 16500 "Photo.c"
+#line 16544 "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 16507 "Photo.c"
+#line 16551 "Photo.c"
 		{
 			GeeIterator* _photo_it = NULL;
 			GeeCollection* _tmp11_ = NULL;
@@ -16518,7 +16562,7 @@ 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 16520 "Photo.c"
+#line 16564 "Photo.c"
 				GeeIterator* _tmp13_ = NULL;
 				gboolean _tmp14_ = FALSE;
 				Photo* photo = NULL;
@@ -16535,7 +16579,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 16537 "Photo.c"
+#line 16581 "Photo.c"
 				}
 #line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = _photo_it;
@@ -16553,11 +16597,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 16555 "Photo.c"
+#line 16599 "Photo.c"
 			}
 #line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_photo_it);
-#line 16559 "Photo.c"
+#line 16603 "Photo.c"
 		}
 	}
 #line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16570,7 +16614,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 16572 "Photo.c"
+#line 16616 "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);
@@ -16578,7 +16622,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 16580 "Photo.c"
+#line 16624 "Photo.c"
 		}
 	}
 }
@@ -16588,7 +16632,7 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
 	guint64 result = 0ULL;
 	guint64 flags = 0ULL;
 	gboolean committed = FALSE;
-	gboolean _tmp16_ = FALSE;
+	gboolean _tmp17_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 2131 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
@@ -16598,14 +16642,14 @@ 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 16600 "Photo.c"
+#line 16644 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 16607 "Photo.c"
+#line 16651 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -16629,7 +16673,7 @@ 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 16631 "Photo.c"
+#line 16675 "Photo.c"
 				PhotoTable* _tmp7_ = NULL;
 				PhotoTable* _tmp8_ = NULL;
 				PhotoID _tmp9_ = {0};
@@ -16654,7 +16698,7 @@ 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 16656 "Photo.c"
+#line 16700 "Photo.c"
 					PhotoRow* _tmp13_ = NULL;
 					guint64 _tmp14_ = 0ULL;
 #line 2140 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16663,7 +16707,7 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
 					_tmp14_ = flags;
 #line 2140 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_->flags = _tmp14_;
-#line 16665 "Photo.c"
+#line 16709 "Photo.c"
 				}
 			}
 		}
@@ -16674,36 +16718,38 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
 			_tmp15_ = self->row;
 #line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16676 "Photo.c"
+#line 16720 "Photo.c"
 		}
 #line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 16724 "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);
 #line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
 #line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
-			return 0ULL;
-#line 16686 "Photo.c"
+			return _tmp16_;
+#line 16732 "Photo.c"
 		}
 	}
 #line 2144 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp16_ = committed;
+	_tmp17_ = committed;
 #line 2144 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp16_) {
-#line 16693 "Photo.c"
-		Alteration* _tmp17_ = NULL;
+	if (_tmp17_) {
+#line 16739 "Photo.c"
+		Alteration* _tmp18_ = NULL;
 #line 2145 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp17_ = additional_alteration;
+		_tmp18_ = additional_alteration;
 #line 2145 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_notify_flags_altered (self, _tmp17_);
-#line 16699 "Photo.c"
+		photo_notify_flags_altered (self, _tmp18_);
+#line 16745 "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 16705 "Photo.c"
+#line 16751 "Photo.c"
 }
 
 
@@ -16712,14 +16758,15 @@ 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 16714 "Photo.c"
+#line 16760 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
+		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 16721 "Photo.c"
+#line 16768 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
@@ -16729,18 +16776,18 @@ gboolean photo_is_master_metadata_dirty (Photo* self) {
 			_tmp2_ = _tmp1_->metadata_dirty;
 #line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 16731 "Photo.c"
+#line 16778 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #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 16738 "Photo.c"
+#line 16785 "Photo.c"
 			}
 #line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 16742 "Photo.c"
+#line 16789 "Photo.c"
 		}
 		__finally332:
 		{
@@ -16749,15 +16796,15 @@ gboolean photo_is_master_metadata_dirty (Photo* self) {
 			_tmp4_ = self->row;
 #line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16751 "Photo.c"
+#line 16798 "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);
 #line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 16759 "Photo.c"
+		return _tmp5_;
+#line 16806 "Photo.c"
 	}
 }
 
@@ -16770,14 +16817,14 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 	g_return_if_fail (IS_PHOTO (self));
 #line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16772 "Photo.c"
+#line 16819 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 16779 "Photo.c"
+#line 16826 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
@@ -16790,7 +16837,7 @@ 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 16792 "Photo.c"
+#line 16839 "Photo.c"
 				PhotoTable* _tmp4_ = NULL;
 				PhotoTable* _tmp5_ = NULL;
 				PhotoID _tmp6_ = {0};
@@ -16811,7 +16858,7 @@ 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 16813 "Photo.c"
+#line 16860 "Photo.c"
 					goto __finally333;
 				}
 #line 2161 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16822,7 +16869,7 @@ 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 16824 "Photo.c"
+#line 16871 "Photo.c"
 			}
 		}
 		__finally333:
@@ -16832,7 +16879,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 			_tmp10_ = self->row;
 #line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16834 "Photo.c"
+#line 16881 "Photo.c"
 		}
 #line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -16842,7 +16889,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 16844 "Photo.c"
+#line 16891 "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);
@@ -16850,7 +16897,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 16852 "Photo.c"
+#line 16899 "Photo.c"
 			}
 		}
 	}
@@ -16858,7 +16905,7 @@ 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 16860 "Photo.c"
+#line 16907 "Photo.c"
 		Alteration* _tmp12_ = NULL;
 		Alteration* _tmp13_ = NULL;
 #line 2167 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16869,7 +16916,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 16871 "Photo.c"
+#line 16918 "Photo.c"
 	}
 }
 
@@ -16880,14 +16927,14 @@ 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 16882 "Photo.c"
+#line 16929 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 16889 "Photo.c"
+#line 16936 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
@@ -16897,18 +16944,18 @@ static Rating photo_real_get_rating (MediaSource* base) {
 			_tmp2_ = _tmp1_->rating;
 #line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 16899 "Photo.c"
+#line 16946 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #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 16906 "Photo.c"
+#line 16953 "Photo.c"
 			}
 #line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 16910 "Photo.c"
+#line 16957 "Photo.c"
 		}
 		__finally334:
 		{
@@ -16917,7 +16964,7 @@ static Rating photo_real_get_rating (MediaSource* base) {
 			_tmp4_ = self->row;
 #line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16919 "Photo.c"
+#line 16966 "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);
@@ -16925,7 +16972,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 16927 "Photo.c"
+#line 16974 "Photo.c"
 	}
 }
 
@@ -16939,14 +16986,14 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16941 "Photo.c"
+#line 16988 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 16948 "Photo.c"
+#line 16995 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			Rating _tmp2_ = 0;
@@ -16960,7 +17007,7 @@ 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 16962 "Photo.c"
+#line 17009 "Photo.c"
 				Rating _tmp5_ = 0;
 				gboolean _tmp6_ = FALSE;
 #line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16969,15 +17016,15 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 				_tmp6_ = rating_is_valid (_tmp5_);
 #line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp6_;
-#line 16971 "Photo.c"
+#line 17018 "Photo.c"
 			} else {
 #line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 16975 "Photo.c"
+#line 17022 "Photo.c"
 			}
 #line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp1_) {
-#line 16979 "Photo.c"
+#line 17026 "Photo.c"
 				PhotoTable* _tmp7_ = NULL;
 				PhotoTable* _tmp8_ = NULL;
 				PhotoID _tmp9_ = {0};
@@ -17002,7 +17049,7 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 				_tmp12_ = committed;
 #line 2182 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp12_) {
-#line 17004 "Photo.c"
+#line 17051 "Photo.c"
 					PhotoRow* _tmp13_ = NULL;
 					Rating _tmp14_ = 0;
 #line 2183 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17011,7 +17058,7 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 					_tmp14_ = rating;
 #line 2183 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_->rating = _tmp14_;
-#line 17013 "Photo.c"
+#line 17060 "Photo.c"
 				}
 			}
 		}
@@ -17022,7 +17069,7 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 			_tmp15_ = self->row;
 #line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17024 "Photo.c"
+#line 17071 "Photo.c"
 		}
 #line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -17032,14 +17079,14 @@ 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 17034 "Photo.c"
+#line 17081 "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 17041 "Photo.c"
+#line 17088 "Photo.c"
 		Alteration* _tmp17_ = NULL;
 		Alteration* _tmp18_ = NULL;
 #line 2188 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17050,7 +17097,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 17052 "Photo.c"
+#line 17099 "Photo.c"
 	}
 }
 
@@ -17060,14 +17107,14 @@ 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 17062 "Photo.c"
+#line 17109 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 17069 "Photo.c"
+#line 17116 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
@@ -17080,7 +17127,7 @@ 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 17082 "Photo.c"
+#line 17129 "Photo.c"
 		}
 		__finally336:
 		{
@@ -17089,7 +17136,7 @@ static void photo_real_increase_rating (MediaSource* base) {
 			_tmp4_ = self->row;
 #line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17091 "Photo.c"
+#line 17138 "Photo.c"
 		}
 #line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -17099,7 +17146,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 17101 "Photo.c"
+#line 17148 "Photo.c"
 		}
 	}
 }
@@ -17110,14 +17157,14 @@ 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 17112 "Photo.c"
+#line 17159 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 17119 "Photo.c"
+#line 17166 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
@@ -17130,7 +17177,7 @@ 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 17132 "Photo.c"
+#line 17179 "Photo.c"
 		}
 		__finally337:
 		{
@@ -17139,7 +17186,7 @@ static void photo_real_decrease_rating (MediaSource* base) {
 			_tmp4_ = self->row;
 #line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17141 "Photo.c"
+#line 17188 "Photo.c"
 		}
 #line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -17149,7 +17196,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 17151 "Photo.c"
+#line 17198 "Photo.c"
 		}
 	}
 }
@@ -17162,7 +17209,7 @@ 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 17164 "Photo.c"
+#line 17211 "Photo.c"
 	{
 		PhotoTable* _tmp0_ = NULL;
 		PhotoTable* _tmp1_ = NULL;
@@ -17184,7 +17231,7 @@ 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 17186 "Photo.c"
+#line 17233 "Photo.c"
 				goto __catch338_database_error;
 			}
 #line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17193,7 +17240,7 @@ 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 17195 "Photo.c"
+#line 17242 "Photo.c"
 		}
 		{
 			PhotoRow* _tmp4_ = NULL;
@@ -17201,7 +17248,7 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 			_tmp4_ = self->row;
 #line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17203 "Photo.c"
+#line 17250 "Photo.c"
 			{
 				PhotoRow* _tmp5_ = NULL;
 				const gchar* _tmp6_ = NULL;
@@ -17216,7 +17263,7 @@ 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 17218 "Photo.c"
+#line 17265 "Photo.c"
 			}
 			__finally339:
 			{
@@ -17225,13 +17272,13 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 				_tmp8_ = self->row;
 #line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17227 "Photo.c"
+#line 17274 "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 17233 "Photo.c"
+#line 17280 "Photo.c"
 					goto __catch338_database_error;
 				}
 #line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17240,7 +17287,7 @@ 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 17242 "Photo.c"
+#line 17289 "Photo.c"
 			}
 		}
 	}
@@ -17270,7 +17317,7 @@ 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 17272 "Photo.c"
+#line 17319 "Photo.c"
 	}
 	__finally338:
 #line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17281,7 +17328,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 17283 "Photo.c"
+#line 17330 "Photo.c"
 	}
 }
 
@@ -17294,14 +17341,15 @@ 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 17296 "Photo.c"
+#line 17343 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
+		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 17303 "Photo.c"
+#line 17351 "Photo.c"
 		{
 			gboolean committed = FALSE;
 			PhotoTable* _tmp1_ = NULL;
@@ -17334,7 +17382,7 @@ 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 17336 "Photo.c"
+#line 17384 "Photo.c"
 				PhotoRow* _tmp9_ = NULL;
 				EventID _tmp10_ = {0};
 #line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17343,22 +17391,22 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) {
 				_tmp10_ = *event_id;
 #line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_->event_id = _tmp10_;
-#line 17345 "Photo.c"
+#line 17393 "Photo.c"
 			}
 #line 2228 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = committed;
-#line 17349 "Photo.c"
+#line 17397 "Photo.c"
 			{
 				PhotoRow* _tmp11_ = NULL;
 #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 17356 "Photo.c"
+#line 17404 "Photo.c"
 			}
 #line 2228 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 17360 "Photo.c"
+#line 17408 "Photo.c"
 		}
 		__finally340:
 		{
@@ -17367,15 +17415,15 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) {
 			_tmp12_ = self->row;
 #line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17369 "Photo.c"
+#line 17417 "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);
 #line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 17377 "Photo.c"
+		return _tmp13_;
+#line 17425 "Photo.c"
 	}
 }
 
@@ -17401,7 +17449,7 @@ static gchar* photo_real_to_string (DataObject* base) {
 	_tmp1_ = photo_is_master_baseline (self);
 #line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp1_) {
-#line 17403 "Photo.c"
+#line 17451 "Photo.c"
 		GFile* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
@@ -17433,7 +17481,7 @@ 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 17435 "Photo.c"
+#line 17483 "Photo.c"
 	} else {
 		gchar* _tmp9_ = NULL;
 #line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17442,7 +17490,7 @@ static gchar* photo_real_to_string (DataObject* base) {
 		_g_free0 (_tmp0_);
 #line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp9_;
-#line 17444 "Photo.c"
+#line 17492 "Photo.c"
 	}
 #line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_photo_id (self, &_tmp10_);
@@ -17476,7 +17524,7 @@ static gchar* photo_real_to_string (DataObject* base) {
 	_g_free0 (_tmp0_);
 #line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 17478 "Photo.c"
+#line 17526 "Photo.c"
 }
 
 
@@ -17503,7 +17551,7 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
 	_tmp2_ = photo;
 #line 2240 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 17505 "Photo.c"
+#line 17553 "Photo.c"
 		PhotoID photo_id = {0};
 		PhotoID _tmp3_ = {0};
 		PhotoID other_photo_id = {0};
@@ -17525,7 +17573,7 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
 		_tmp7_ = photo;
 #line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (self != _tmp7_) {
-#line 17527 "Photo.c"
+#line 17575 "Photo.c"
 			PhotoID _tmp8_ = {0};
 			gint64 _tmp9_ = 0LL;
 #line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17534,15 +17582,15 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
 			_tmp9_ = _tmp8_.id;
 #line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp9_ != PHOTO_ID_INVALID;
-#line 17536 "Photo.c"
+#line 17584 "Photo.c"
 		} else {
 #line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = FALSE;
-#line 17540 "Photo.c"
+#line 17588 "Photo.c"
 		}
 #line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp6_) {
-#line 17544 "Photo.c"
+#line 17592 "Photo.c"
 			PhotoID _tmp10_ = {0};
 			gint64 _tmp11_ = 0LL;
 			PhotoID _tmp12_ = {0};
@@ -17557,7 +17605,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 17559 "Photo.c"
+#line 17607 "Photo.c"
 		}
 	}
 #line 2249 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17570,7 +17618,7 @@ 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 17572 "Photo.c"
+#line 17620 "Photo.c"
 }
 
 
@@ -17598,7 +17646,7 @@ static void photo_file_exif_updated (Photo* self) {
 	file = _tmp0_;
 #line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
 	info = NULL;
-#line 17600 "Photo.c"
+#line 17648 "Photo.c"
 	{
 		GFileInfo* _tmp1_ = NULL;
 		GFileInfo* _tmp2_ = NULL;
@@ -17609,7 +17657,7 @@ static void photo_file_exif_updated (Photo* self) {
 		_tmp1_ = _tmp2_;
 #line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17611 "Photo.c"
+#line 17659 "Photo.c"
 			goto __catch341_g_error;
 		}
 #line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17622,7 +17670,7 @@ static void photo_file_exif_updated (Photo* self) {
 		info = _tmp3_;
 #line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 17624 "Photo.c"
+#line 17672 "Photo.c"
 	}
 	goto __finally341;
 	__catch341_g_error:
@@ -17647,7 +17695,7 @@ 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 17649 "Photo.c"
+#line 17697 "Photo.c"
 	}
 	__finally341:
 #line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17662,7 +17710,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 17664 "Photo.c"
+#line 17712 "Photo.c"
 	}
 #line 2264 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = info;
@@ -17674,13 +17722,13 @@ 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 17676 "Photo.c"
+#line 17724 "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 17682 "Photo.c"
+#line 17730 "Photo.c"
 			goto __catch342_g_error;
 		}
 	}
@@ -17710,7 +17758,7 @@ 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 17712 "Photo.c"
+#line 17760 "Photo.c"
 	}
 	__finally342:
 #line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17727,7 +17775,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 17729 "Photo.c"
+#line 17777 "Photo.c"
 	}
 #line 2274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = photo_file_interrogator_get_detected_photo_information (interrogator);
@@ -17739,18 +17787,18 @@ static void photo_file_exif_updated (Photo* self) {
 	if (_tmp16_ == NULL) {
 #line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = TRUE;
-#line 17741 "Photo.c"
+#line 17789 "Photo.c"
 	} else {
 		gboolean _tmp17_ = FALSE;
 #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 17748 "Photo.c"
+#line 17796 "Photo.c"
 	}
 #line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp15_) {
-#line 17752 "Photo.c"
+#line 17800 "Photo.c"
 		gchar* _tmp18_ = NULL;
 		gchar* _tmp19_ = NULL;
 #line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17771,7 +17819,7 @@ static void photo_file_exif_updated (Photo* self) {
 		_g_object_unref0 (file);
 #line 2278 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 17773 "Photo.c"
+#line 17821 "Photo.c"
 	}
 	{
 		PhotoRow* _tmp20_ = NULL;
@@ -17779,7 +17827,7 @@ static void photo_file_exif_updated (Photo* self) {
 		_tmp20_ = self->row;
 #line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17781 "Photo.c"
+#line 17829 "Photo.c"
 		{
 			PhotoTable* _tmp21_ = NULL;
 			PhotoTable* _tmp22_ = NULL;
@@ -17830,7 +17878,7 @@ static void photo_file_exif_updated (Photo* self) {
 			success = _tmp35_;
 #line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp22_);
-#line 17832 "Photo.c"
+#line 17880 "Photo.c"
 		}
 		__finally343:
 		{
@@ -17839,7 +17887,7 @@ static void photo_file_exif_updated (Photo* self) {
 			_tmp36_ = self->row;
 #line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17841 "Photo.c"
+#line 17889 "Photo.c"
 		}
 #line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -17857,14 +17905,14 @@ static void photo_file_exif_updated (Photo* self) {
 			g_clear_error (&_inner_error_);
 #line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17859 "Photo.c"
+#line 17907 "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 17866 "Photo.c"
+#line 17914 "Photo.c"
 		Alteration* _tmp38_ = NULL;
 		Alteration* _tmp39_ = NULL;
 #line 2288 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17875,7 +17923,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 17877 "Photo.c"
+#line 17925 "Photo.c"
 	}
 #line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
@@ -17885,7 +17933,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 17887 "Photo.c"
+#line 17935 "Photo.c"
 }
 
 
@@ -17895,14 +17943,15 @@ 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 17897 "Photo.c"
+#line 17945 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
+		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 17904 "Photo.c"
+#line 17953 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			gint64 _tmp2_ = 0LL;
@@ -17912,18 +17961,18 @@ static guint64 photo_real_get_filesize (MediaSource* base) {
 			_tmp2_ = _tmp1_->filesize;
 #line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = (guint64) _tmp2_;
-#line 17914 "Photo.c"
+#line 17963 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #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 17921 "Photo.c"
+#line 17970 "Photo.c"
 			}
 #line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 17925 "Photo.c"
+#line 17974 "Photo.c"
 		}
 		__finally344:
 		{
@@ -17932,15 +17981,15 @@ static guint64 photo_real_get_filesize (MediaSource* base) {
 			_tmp4_ = self->row;
 #line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17934 "Photo.c"
+#line 17983 "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);
 #line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
-		return 0ULL;
-#line 17942 "Photo.c"
+		return _tmp5_;
+#line 17991 "Photo.c"
 	}
 }
 
@@ -17951,14 +18000,15 @@ 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 17953 "Photo.c"
+#line 18002 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
+		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 17960 "Photo.c"
+#line 18010 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			BackingPhotoRow* _tmp2_ = NULL;
@@ -17971,18 +18021,18 @@ 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 17973 "Photo.c"
+#line 18023 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
 #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 17980 "Photo.c"
+#line 18030 "Photo.c"
 			}
 #line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 17984 "Photo.c"
+#line 18034 "Photo.c"
 		}
 		__finally345:
 		{
@@ -17991,15 +18041,15 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) {
 			_tmp5_ = self->row;
 #line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17993 "Photo.c"
+#line 18043 "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);
 #line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
-		return 0ULL;
-#line 18001 "Photo.c"
+		return _tmp6_;
+#line 18051 "Photo.c"
 	}
 }
 
@@ -18009,14 +18059,15 @@ 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 18011 "Photo.c"
+#line 18061 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
+		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 18018 "Photo.c"
+#line 18069 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			gint64 _tmp2_ = 0LL;
@@ -18026,18 +18077,18 @@ guint64 photo_get_editable_filesize (Photo* self) {
 			_tmp2_ = _tmp1_->filesize;
 #line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = (guint64) _tmp2_;
-#line 18028 "Photo.c"
+#line 18079 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #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 18035 "Photo.c"
+#line 18086 "Photo.c"
 			}
 #line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18039 "Photo.c"
+#line 18090 "Photo.c"
 		}
 		__finally346:
 		{
@@ -18046,15 +18097,15 @@ guint64 photo_get_editable_filesize (Photo* self) {
 			_tmp4_ = self->row;
 #line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18048 "Photo.c"
+#line 18099 "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);
 #line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
-		return 0ULL;
-#line 18056 "Photo.c"
+		return _tmp5_;
+#line 18107 "Photo.c"
 	}
 }
 
@@ -18071,7 +18122,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 18073 "Photo.c"
+#line 18124 "Photo.c"
 }
 
 
@@ -18081,14 +18132,14 @@ 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 18083 "Photo.c"
+#line 18134 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 18090 "Photo.c"
+#line 18141 "Photo.c"
 		{
 			const gchar* _tmp1_ = NULL;
 			gchar* _tmp2_ = NULL;
@@ -18098,18 +18149,18 @@ static gchar* photo_real_get_basename (MediaSource* base) {
 			_tmp2_ = g_strdup (_tmp1_);
 #line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 18100 "Photo.c"
+#line 18151 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #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 18107 "Photo.c"
+#line 18158 "Photo.c"
 			}
 #line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18111 "Photo.c"
+#line 18162 "Photo.c"
 		}
 		__finally347:
 		{
@@ -18118,7 +18169,7 @@ static gchar* photo_real_get_basename (MediaSource* base) {
 			_tmp4_ = self->row;
 #line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18120 "Photo.c"
+#line 18171 "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);
@@ -18126,7 +18177,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 18128 "Photo.c"
+#line 18179 "Photo.c"
 	}
 }
 
@@ -18137,14 +18188,14 @@ 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 18139 "Photo.c"
+#line 18190 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 18146 "Photo.c"
+#line 18197 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
@@ -18157,18 +18208,18 @@ static gchar* photo_real_get_title (MediaSource* base) {
 			_tmp3_ = g_strdup (_tmp2_);
 #line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 18159 "Photo.c"
+#line 18210 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
 #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 18166 "Photo.c"
+#line 18217 "Photo.c"
 			}
 #line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18170 "Photo.c"
+#line 18221 "Photo.c"
 		}
 		__finally348:
 		{
@@ -18177,7 +18228,7 @@ static gchar* photo_real_get_title (MediaSource* base) {
 			_tmp5_ = self->row;
 #line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18179 "Photo.c"
+#line 18230 "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);
@@ -18185,7 +18236,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 18187 "Photo.c"
+#line 18238 "Photo.c"
 	}
 }
 
@@ -18196,14 +18247,14 @@ 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 18198 "Photo.c"
+#line 18249 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 18205 "Photo.c"
+#line 18256 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
@@ -18216,18 +18267,18 @@ static gchar* photo_real_get_comment (MediaSource* base) {
 			_tmp3_ = g_strdup (_tmp2_);
 #line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 18218 "Photo.c"
+#line 18269 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
 #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 18225 "Photo.c"
+#line 18276 "Photo.c"
 			}
 #line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18229 "Photo.c"
+#line 18280 "Photo.c"
 		}
 		__finally349:
 		{
@@ -18236,7 +18287,7 @@ static gchar* photo_real_get_comment (MediaSource* base) {
 			_tmp5_ = self->row;
 #line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18238 "Photo.c"
+#line 18289 "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);
@@ -18244,7 +18295,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 18246 "Photo.c"
+#line 18297 "Photo.c"
 	}
 }
 
@@ -18267,14 +18318,14 @@ 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 18269 "Photo.c"
+#line 18320 "Photo.c"
 	{
 		PhotoRow* _tmp2_ = NULL;
 #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 18276 "Photo.c"
+#line 18327 "Photo.c"
 		{
 			const gchar* _tmp3_ = NULL;
 			PhotoRow* _tmp4_ = NULL;
@@ -18294,20 +18345,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 18296 "Photo.c"
+#line 18347 "Photo.c"
 				{
 					PhotoRow* _tmp6_ = NULL;
 #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 18303 "Photo.c"
+#line 18354 "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 18309 "Photo.c"
+#line 18360 "Photo.c"
 			}
 #line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = photo_table_get_instance ();
@@ -18329,7 +18380,7 @@ 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 18331 "Photo.c"
+#line 18382 "Photo.c"
 				PhotoRow* _tmp14_ = NULL;
 				const gchar* _tmp15_ = NULL;
 				gchar* _tmp16_ = NULL;
@@ -18343,7 +18394,7 @@ 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 18345 "Photo.c"
+#line 18396 "Photo.c"
 			}
 		}
 		__finally350:
@@ -18353,7 +18404,7 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
 			_tmp17_ = self->row;
 #line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18355 "Photo.c"
+#line 18406 "Photo.c"
 		}
 #line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -18365,14 +18416,14 @@ 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 18367 "Photo.c"
+#line 18418 "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 18374 "Photo.c"
+#line 18425 "Photo.c"
 		Alteration* _tmp19_ = NULL;
 		Alteration* _tmp20_ = NULL;
 #line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18383,11 +18434,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 18385 "Photo.c"
+#line 18436 "Photo.c"
 	}
 #line 2333 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (new_title);
-#line 18389 "Photo.c"
+#line 18440 "Photo.c"
 }
 
 
@@ -18398,7 +18449,7 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	gboolean committed = FALSE;
-	gboolean _tmp18_ = FALSE;
+	gboolean _tmp19_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 2350 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
@@ -18410,14 +18461,14 @@ 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 18412 "Photo.c"
+#line 18463 "Photo.c"
 	{
 		PhotoRow* _tmp2_ = NULL;
 #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 18419 "Photo.c"
+#line 18470 "Photo.c"
 		{
 			const gchar* _tmp3_ = NULL;
 			PhotoRow* _tmp4_ = NULL;
@@ -18439,20 +18490,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 18441 "Photo.c"
+#line 18492 "Photo.c"
 				{
 					PhotoRow* _tmp6_ = NULL;
 #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 18448 "Photo.c"
+#line 18499 "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 18454 "Photo.c"
+#line 18505 "Photo.c"
 			}
 #line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = photo_table_get_instance ();
@@ -18474,7 +18525,7 @@ 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 18476 "Photo.c"
+#line 18527 "Photo.c"
 				PhotoRow* _tmp14_ = NULL;
 				const gchar* _tmp15_ = NULL;
 				gchar* _tmp16_ = NULL;
@@ -18488,7 +18539,7 @@ 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 18490 "Photo.c"
+#line 18541 "Photo.c"
 			}
 		}
 		__finally351:
@@ -18498,10 +18549,12 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 			_tmp17_ = self->row;
 #line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18500 "Photo.c"
+#line 18551 "Photo.c"
 		}
 #line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 18555 "Photo.c"
+			gboolean _tmp18_ = FALSE;
 #line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (new_comment);
 #line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18509,26 +18562,26 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 #line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
 #line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
-			return FALSE;
-#line 18512 "Photo.c"
+			return _tmp18_;
+#line 18565 "Photo.c"
 		}
 	}
 #line 2363 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp18_ = committed;
+	_tmp19_ = committed;
 #line 2363 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp18_) {
-#line 18519 "Photo.c"
-		Alteration* _tmp19_ = NULL;
+	if (_tmp19_) {
+#line 18572 "Photo.c"
 		Alteration* _tmp20_ = NULL;
+		Alteration* _tmp21_ = NULL;
 #line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp19_ = alteration_new ("metadata", "comment");
+		_tmp20_ = alteration_new ("metadata", "comment");
 #line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp20_ = _tmp19_;
+		_tmp21_ = _tmp20_;
 #line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
-		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
+		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 (_tmp20_);
-#line 18530 "Photo.c"
+		_alteration_unref0 (_tmp21_);
+#line 18583 "Photo.c"
 	}
 #line 2366 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = committed;
@@ -18536,14 +18589,14 @@ 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 18538 "Photo.c"
+#line 18591 "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 18545 "Photo.c"
+#line 18598 "Photo.c"
 }
 
 
@@ -18557,14 +18610,14 @@ 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 18559 "Photo.c"
+#line 18612 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 18566 "Photo.c"
+#line 18619 "Photo.c"
 		{
 			{
 				PhotoTable* _tmp1_ = NULL;
@@ -18592,7 +18645,7 @@ 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 18594 "Photo.c"
+#line 18647 "Photo.c"
 						goto __catch353_database_error;
 					}
 					{
@@ -18601,7 +18654,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 						_tmp6_ = self->row;
 #line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18603 "Photo.c"
+#line 18656 "Photo.c"
 					}
 #line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_error_free0 (dberr);
@@ -18611,7 +18664,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 18613 "Photo.c"
+#line 18666 "Photo.c"
 				}
 #line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->row;
@@ -18619,7 +18672,7 @@ 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 18621 "Photo.c"
+#line 18674 "Photo.c"
 			}
 			goto __finally353;
 			__catch353_database_error:
@@ -18641,19 +18694,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 18643 "Photo.c"
+#line 18696 "Photo.c"
 			}
 			__finally353:
 #line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18648 "Photo.c"
+#line 18701 "Photo.c"
 				{
 					PhotoRow* _tmp11_ = NULL;
 #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 18655 "Photo.c"
+#line 18708 "Photo.c"
 				}
 #line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (dberr);
@@ -18663,7 +18716,7 @@ 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 18665 "Photo.c"
+#line 18718 "Photo.c"
 			}
 		}
 		__finally352:
@@ -18673,7 +18726,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 			_tmp12_ = self->row;
 #line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18675 "Photo.c"
+#line 18728 "Photo.c"
 		}
 #line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -18685,14 +18738,14 @@ 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 18687 "Photo.c"
+#line 18740 "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 18694 "Photo.c"
+#line 18747 "Photo.c"
 		Alteration* _tmp14_ = NULL;
 		Alteration* _tmp15_ = NULL;
 #line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18703,7 +18756,7 @@ 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 18705 "Photo.c"
+#line 18758 "Photo.c"
 	} else {
 		gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
@@ -18721,11 +18774,11 @@ 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 18723 "Photo.c"
+#line 18776 "Photo.c"
 	}
 #line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_error_free0 (dberr);
-#line 18727 "Photo.c"
+#line 18780 "Photo.c"
 }
 
 
@@ -18762,7 +18815,7 @@ 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 18764 "Photo.c"
+#line 18817 "Photo.c"
 		PhotoFileReader* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -18785,7 +18838,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 18787 "Photo.c"
+#line 18840 "Photo.c"
 	}
 #line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = source;
@@ -18801,7 +18854,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 18803 "Photo.c"
+#line 18856 "Photo.c"
 	}
 #line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = metadata;
@@ -18825,7 +18878,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 18827 "Photo.c"
+#line 18880 "Photo.c"
 	}
 #line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = source;
@@ -18837,7 +18890,7 @@ 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 18839 "Photo.c"
+#line 18892 "Photo.c"
 	{
 		PhotoFileMetadataWriter* _tmp17_ = NULL;
 		PhotoMetadata* _tmp18_ = NULL;
@@ -18849,7 +18902,7 @@ 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 18851 "Photo.c"
+#line 18904 "Photo.c"
 			goto __finally354;
 		}
 	}
@@ -18868,7 +18921,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 18870 "Photo.c"
+#line 18923 "Photo.c"
 	}
 #line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -18882,7 +18935,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 18884 "Photo.c"
+#line 18937 "Photo.c"
 	}
 #line 2409 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = title;
@@ -18896,7 +18949,7 @@ 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 18898 "Photo.c"
+#line 18951 "Photo.c"
 }
 
 
@@ -18933,7 +18986,7 @@ 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 18935 "Photo.c"
+#line 18988 "Photo.c"
 		PhotoFileReader* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -18956,7 +19009,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 18958 "Photo.c"
+#line 19011 "Photo.c"
 	}
 #line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = source;
@@ -18972,7 +19025,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 18974 "Photo.c"
+#line 19027 "Photo.c"
 	}
 #line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = metadata;
@@ -18996,7 +19049,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 18998 "Photo.c"
+#line 19051 "Photo.c"
 	}
 #line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = source;
@@ -19008,7 +19061,7 @@ 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 19010 "Photo.c"
+#line 19063 "Photo.c"
 	{
 		PhotoFileMetadataWriter* _tmp17_ = NULL;
 		PhotoMetadata* _tmp18_ = NULL;
@@ -19020,7 +19073,7 @@ 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 19022 "Photo.c"
+#line 19075 "Photo.c"
 			goto __finally355;
 		}
 	}
@@ -19039,7 +19092,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 19041 "Photo.c"
+#line 19094 "Photo.c"
 	}
 #line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -19053,7 +19106,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 19055 "Photo.c"
+#line 19108 "Photo.c"
 	}
 #line 2437 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = comment;
@@ -19067,7 +19120,7 @@ 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 19069 "Photo.c"
+#line 19122 "Photo.c"
 }
 
 
@@ -19078,14 +19131,14 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
 	GError * _inner_error_ = NULL;
 #line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 19080 "Photo.c"
+#line 19133 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 19087 "Photo.c"
+#line 19140 "Photo.c"
 		{
 			PhotoTable* _tmp1_ = NULL;
 			PhotoTable* _tmp2_ = NULL;
@@ -19114,7 +19167,7 @@ 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 19116 "Photo.c"
+#line 19169 "Photo.c"
 				PhotoRow* _tmp8_ = NULL;
 				time_t _tmp9_ = 0;
 				time_t _tmp10_ = 0;
@@ -19128,7 +19181,7 @@ 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 19130 "Photo.c"
+#line 19183 "Photo.c"
 			}
 		}
 		__finally356:
@@ -19138,7 +19191,7 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
 			_tmp11_ = self->row;
 #line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19140 "Photo.c"
+#line 19193 "Photo.c"
 		}
 #line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -19148,14 +19201,14 @@ 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 19150 "Photo.c"
+#line 19203 "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 19157 "Photo.c"
+#line 19210 "Photo.c"
 		Alteration* _tmp13_ = NULL;
 		Alteration* _tmp14_ = NULL;
 #line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19166,7 +19219,7 @@ 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 19168 "Photo.c"
+#line 19221 "Photo.c"
 	}
 }
 
@@ -19206,7 +19259,7 @@ 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 19208 "Photo.c"
+#line 19261 "Photo.c"
 		PhotoFileReader* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -19229,7 +19282,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 19231 "Photo.c"
+#line 19284 "Photo.c"
 	}
 #line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = source;
@@ -19245,7 +19298,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 19247 "Photo.c"
+#line 19300 "Photo.c"
 	}
 #line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = metadata;
@@ -19275,7 +19328,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 19277 "Photo.c"
+#line 19330 "Photo.c"
 	}
 #line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = source;
@@ -19287,7 +19340,7 @@ 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 19289 "Photo.c"
+#line 19342 "Photo.c"
 	{
 		PhotoFileMetadataWriter* _tmp19_ = NULL;
 		PhotoMetadata* _tmp20_ = NULL;
@@ -19299,7 +19352,7 @@ 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 19301 "Photo.c"
+#line 19354 "Photo.c"
 			goto __finally357;
 		}
 	}
@@ -19318,7 +19371,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 19320 "Photo.c"
+#line 19373 "Photo.c"
 	}
 #line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -19332,7 +19385,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 19334 "Photo.c"
+#line 19387 "Photo.c"
 	}
 #line 2479 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = time;
@@ -19346,7 +19399,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 19348 "Photo.c"
+#line 19401 "Photo.c"
 }
 
 
@@ -19385,7 +19438,7 @@ 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 19387 "Photo.c"
+#line 19440 "Photo.c"
 		Orientation ori_tmp = 0;
 		Orientation _tmp3_ = 0;
 		Orientation _tmp4_ = 0;
@@ -19405,7 +19458,7 @@ 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 19407 "Photo.c"
+#line 19460 "Photo.c"
 			{
 				gint width_tmp = 0;
 				Dimensions _tmp5_ = {0};
@@ -19431,13 +19484,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 19433 "Photo.c"
+#line 19486 "Photo.c"
 			}
 			default:
 			{
 #line 2520 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 19439 "Photo.c"
+#line 19492 "Photo.c"
 			}
 		}
 	}
@@ -19447,7 +19500,7 @@ 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 19449 "Photo.c"
+#line 19502 "Photo.c"
 		gdouble x_size = 0.0;
 		gdouble y_size = 0.0;
 		gdouble angle = 0.0;
@@ -19491,7 +19544,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 19493 "Photo.c"
+#line 19546 "Photo.c"
 	}
 #line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = disallowed_steps;
@@ -19499,7 +19552,7 @@ 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 19501 "Photo.c"
+#line 19554 "Photo.c"
 		Box crop = {0};
 		PhotoException _tmp24_ = 0;
 		Box _tmp25_ = {0};
@@ -19512,20 +19565,20 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 		crop = _tmp25_;
 #line 2540 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp26_) {
-#line 19514 "Photo.c"
+#line 19567 "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 19520 "Photo.c"
+#line 19573 "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 19527 "Photo.c"
+#line 19580 "Photo.c"
 }
 
 
@@ -19552,13 +19605,13 @@ 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 19554 "Photo.c"
+#line 19607 "Photo.c"
 		PixelTransformationBundle* _tmp3_ = NULL;
 #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 19560 "Photo.c"
+#line 19613 "Photo.c"
 	} else {
 		PixelTransformationBundle* _tmp4_ = NULL;
 		KeyValueMap* _tmp5_ = NULL;
@@ -19568,7 +19621,7 @@ static void photo_locked_create_adjustments_from_data (Photo* self) {
 		_tmp5_ = map;
 #line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixel_transformation_bundle_load (_tmp4_, _tmp5_);
-#line 19570 "Photo.c"
+#line 19623 "Photo.c"
 	}
 #line 2557 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = self->priv->adjustments;
@@ -19580,7 +19633,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 19582 "Photo.c"
+#line 19635 "Photo.c"
 }
 
 
@@ -19589,14 +19642,14 @@ 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 19591 "Photo.c"
+#line 19644 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 19598 "Photo.c"
+#line 19651 "Photo.c"
 		{
 			PixelTransformationBundle* _tmp1_ = NULL;
 			PixelTransformationBundle* _tmp2_ = NULL;
@@ -19607,7 +19660,7 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) {
 			if (_tmp1_ == NULL) {
 #line 2564 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_locked_create_adjustments_from_data (self);
-#line 19609 "Photo.c"
+#line 19662 "Photo.c"
 			}
 #line 2566 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->adjustments;
@@ -19615,18 +19668,18 @@ 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 19617 "Photo.c"
+#line 19670 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
 #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 19624 "Photo.c"
+#line 19677 "Photo.c"
 			}
 #line 2566 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 19628 "Photo.c"
+#line 19681 "Photo.c"
 		}
 		__finally358:
 		{
@@ -19635,7 +19688,7 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) {
 			_tmp5_ = self->row;
 #line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19637 "Photo.c"
+#line 19690 "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);
@@ -19643,7 +19696,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 19645 "Photo.c"
+#line 19698 "Photo.c"
 	}
 }
 
@@ -19653,14 +19706,14 @@ 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 19655 "Photo.c"
+#line 19708 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 19662 "Photo.c"
+#line 19715 "Photo.c"
 		{
 			PixelTransformer* _tmp1_ = NULL;
 			PixelTransformer* _tmp2_ = NULL;
@@ -19671,7 +19724,7 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) {
 			if (_tmp1_ == NULL) {
 #line 2573 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_locked_create_adjustments_from_data (self);
-#line 19673 "Photo.c"
+#line 19726 "Photo.c"
 			}
 #line 2575 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->transformer;
@@ -19679,18 +19732,18 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) {
 			_tmp3_ = pixel_transformer_copy (_tmp2_);
 #line 2575 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 19681 "Photo.c"
+#line 19734 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
 #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 19688 "Photo.c"
+#line 19741 "Photo.c"
 			}
 #line 2575 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 19692 "Photo.c"
+#line 19745 "Photo.c"
 		}
 		__finally359:
 		{
@@ -19699,7 +19752,7 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) {
 			_tmp5_ = self->row;
 #line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19701 "Photo.c"
+#line 19754 "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);
@@ -19707,7 +19760,7 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 19709 "Photo.c"
+#line 19762 "Photo.c"
 	}
 }
 
@@ -19723,7 +19776,7 @@ gboolean photo_has_color_adjustments (Photo* self) {
 	result = _tmp0_;
 #line 2580 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 19725 "Photo.c"
+#line 19778 "Photo.c"
 }
 
 
@@ -19752,7 +19805,7 @@ PixelTransformation* photo_get_color_adjustment (Photo* self, PixelTransformatio
 	result = _tmp4_;
 #line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 19754 "Photo.c"
+#line 19807 "Photo.c"
 }
 
 
@@ -19775,7 +19828,7 @@ 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 19777 "Photo.c"
+#line 19830 "Photo.c"
 		gboolean _result_ = FALSE;
 		gboolean _tmp5_ = FALSE;
 		{
@@ -19784,7 +19837,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 			_tmp2_ = self->row;
 #line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19786 "Photo.c"
+#line 19839 "Photo.c"
 			{
 				gboolean _tmp3_ = FALSE;
 #line 2593 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19799,7 +19852,7 @@ 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 19801 "Photo.c"
+#line 19854 "Photo.c"
 			}
 			__finally360:
 			{
@@ -19808,7 +19861,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 				_tmp4_ = self->row;
 #line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19810 "Photo.c"
+#line 19863 "Photo.c"
 			}
 #line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -19818,14 +19871,14 @@ 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 19820 "Photo.c"
+#line 19873 "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 19827 "Photo.c"
+#line 19880 "Photo.c"
 			Alteration* _tmp6_ = NULL;
 			Alteration* _tmp7_ = NULL;
 #line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19836,11 +19889,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 19838 "Photo.c"
+#line 19891 "Photo.c"
 		}
 #line 2601 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19842 "Photo.c"
+#line 19895 "Photo.c"
 	}
 #line 2605 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = new_adjustments;
@@ -19848,14 +19901,14 @@ 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 19850 "Photo.c"
+#line 19903 "Photo.c"
 	{
 		PhotoRow* _tmp10_ = NULL;
 #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 19857 "Photo.c"
+#line 19910 "Photo.c"
 		{
 			gboolean _tmp11_ = FALSE;
 			PixelTransformer* _tmp12_ = NULL;
@@ -19867,18 +19920,18 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 			if (_tmp12_ == NULL) {
 #line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = TRUE;
-#line 19869 "Photo.c"
+#line 19922 "Photo.c"
 			} else {
 				PixelTransformationBundle* _tmp13_ = NULL;
 #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 19876 "Photo.c"
+#line 19929 "Photo.c"
 			}
 #line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp11_) {
-#line 19880 "Photo.c"
+#line 19933 "Photo.c"
 				PixelTransformationBundle* _tmp14_ = NULL;
 				PixelTransformationBundle* _tmp15_ = NULL;
 				PixelTransformationBundle* _tmp16_ = NULL;
@@ -19899,7 +19952,7 @@ 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 19901 "Photo.c"
+#line 19954 "Photo.c"
 			} else {
 				PixelTransformationBundle* _tmp34_ = NULL;
 				PixelTransformationBundle* _tmp35_ = NULL;
@@ -19926,7 +19979,7 @@ 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 19928 "Photo.c"
+#line 19981 "Photo.c"
 						GeeIterator* _tmp23_ = NULL;
 						gboolean _tmp24_ = FALSE;
 						PixelTransformation* transformation = NULL;
@@ -19947,7 +20000,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 						if (!_tmp24_) {
 #line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 19949 "Photo.c"
+#line 20002 "Photo.c"
 						}
 #line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp25_ = _transformation_it;
@@ -19975,11 +20028,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 19977 "Photo.c"
+#line 20030 "Photo.c"
 					}
 #line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_transformation_it);
-#line 19981 "Photo.c"
+#line 20034 "Photo.c"
 				}
 #line 2621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = new_adjustments;
@@ -19989,7 +20042,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 19991 "Photo.c"
+#line 20044 "Photo.c"
 			}
 #line 2624 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp36_ = map;
@@ -19997,7 +20050,7 @@ 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 19999 "Photo.c"
+#line 20052 "Photo.c"
 		}
 		__finally361:
 		{
@@ -20006,7 +20059,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 			_tmp38_ = self->row;
 #line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20008 "Photo.c"
+#line 20061 "Photo.c"
 		}
 #line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -20018,14 +20071,14 @@ 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 20020 "Photo.c"
+#line 20073 "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 20027 "Photo.c"
+#line 20080 "Photo.c"
 		Alteration* _tmp40_ = NULL;
 		Alteration* _tmp41_ = NULL;
 #line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20036,11 +20089,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 20038 "Photo.c"
+#line 20091 "Photo.c"
 	}
 #line 2587 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 20042 "Photo.c"
+#line 20095 "Photo.c"
 }
 
 
@@ -20050,7 +20103,7 @@ 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 20052 "Photo.c"
+#line 20105 "Photo.c"
 	{
 		PhotoMetadata* _tmp0_ = NULL;
 		PhotoFileReader* _tmp1_ = NULL;
@@ -20072,7 +20125,7 @@ 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 20074 "Photo.c"
+#line 20127 "Photo.c"
 			goto __catch362_g_error;
 		}
 #line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20085,7 +20138,7 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
 		_media_metadata_unref0 (_tmp0_);
 #line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20087 "Photo.c"
+#line 20140 "Photo.c"
 	}
 	goto __finally362;
 	__catch362_g_error:
@@ -20109,7 +20162,7 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
 		_g_error_free0 (err);
 #line 2638 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20111 "Photo.c"
+#line 20164 "Photo.c"
 	}
 	__finally362:
 #line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20118,7 +20171,7 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
 	g_clear_error (&_inner_error_);
 #line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 20120 "Photo.c"
+#line 20173 "Photo.c"
 }
 
 
@@ -20151,7 +20204,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 20153 "Photo.c"
+#line 20206 "Photo.c"
 	}
 #line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp0_;
@@ -20163,7 +20216,7 @@ 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 20165 "Photo.c"
+#line 20218 "Photo.c"
 }
 
 
@@ -20184,7 +20237,7 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) {
 	_tmp2_ = reader;
 #line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 20186 "Photo.c"
+#line 20239 "Photo.c"
 		PhotoFileReader* _tmp3_ = NULL;
 		PhotoMetadata* _tmp4_ = NULL;
 #line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20205,14 +20258,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 20207 "Photo.c"
+#line 20260 "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 20214 "Photo.c"
+#line 20267 "Photo.c"
 	}
 #line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
@@ -20220,7 +20273,7 @@ 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 20222 "Photo.c"
+#line 20275 "Photo.c"
 }
 
 
@@ -20235,13 +20288,13 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
 	PhotoFileMetadataWriter* _tmp4_ = NULL;
 	PhotoFileReader* _tmp5_ = NULL;
 	PhotoFileMetadataWriter* _tmp6_ = NULL;
-	PhotoFileMetadataWriter* _tmp7_ = NULL;
 	PhotoFileMetadataWriter* _tmp8_ = NULL;
-	PhotoMetadata* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	PhotoReimportMasterState* _tmp11_ = NULL;
+	PhotoFileMetadataWriter* _tmp9_ = NULL;
+	PhotoMetadata* _tmp10_ = NULL;
 	gboolean _tmp12_ = FALSE;
 	PhotoReimportMasterState* _tmp13_ = NULL;
+	gboolean _tmp14_ = FALSE;
+	PhotoReimportMasterState* _tmp16_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 2655 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -20271,15 +20324,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 20273 "Photo.c"
+#line 20326 "Photo.c"
 		} else {
 #line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_state);
-#line 20277 "Photo.c"
+#line 20330 "Photo.c"
 		}
 #line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20281 "Photo.c"
+#line 20334 "Photo.c"
 	}
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = master_reader;
@@ -20289,28 +20342,32 @@ 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"
+		gboolean _tmp7_ = 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"
 		_photo_file_adapter_unref0 (master_reader);
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 20297 "Photo.c"
+		return _tmp7_;
+#line 20352 "Photo.c"
 	}
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp7_ = _tmp4_;
+	_tmp8_ = _tmp4_;
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = NULL;
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp8_ = _tmp7_;
+	_tmp9_ = _tmp8_;
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp9_ = metadata;
+	_tmp10_ = metadata;
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_file_metadata_writer_write_metadata (_tmp8_, _tmp9_, &_inner_error_);
+	photo_file_metadata_writer_write_metadata (_tmp9_, _tmp10_, &_inner_error_);
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
-	_photo_file_adapter_unref0 (_tmp8_);
+	_photo_file_adapter_unref0 (_tmp9_);
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 20368 "Photo.c"
+		gboolean _tmp11_ = 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"
@@ -20318,19 +20375,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 FALSE;
-#line 20321 "Photo.c"
+		return _tmp11_;
+#line 20378 "Photo.c"
 	}
 #line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp12_ = photo_prepare_for_reimport_master (self, &_tmp11_, &_inner_error_);
+	_tmp14_ = photo_prepare_for_reimport_master (self, &_tmp13_, &_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 = _tmp11_;
+	_vala_state = _tmp13_;
 #line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp10_ = _tmp12_;
+	_tmp12_ = _tmp14_;
 #line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 20390 "Photo.c"
+		gboolean _tmp15_ = 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"
@@ -20338,11 +20397,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 FALSE;
-#line 20341 "Photo.c"
+		return _tmp15_;
+#line 20400 "Photo.c"
 	}
 #line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (!_tmp10_) {
+	if (!_tmp12_) {
 #line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
 #line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20353,20 +20412,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 20355 "Photo.c"
+#line 20414 "Photo.c"
 		} else {
 #line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_state);
-#line 20359 "Photo.c"
+#line 20418 "Photo.c"
 		}
 #line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20363 "Photo.c"
+#line 20422 "Photo.c"
 	}
 #line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp13_ = _vala_state;
+	_tmp16_ = _vala_state;
 #line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
-	G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)->metadata_only = TRUE;
+	G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, 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"
@@ -20377,15 +20436,15 @@ 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 20379 "Photo.c"
+#line 20438 "Photo.c"
 	} else {
 #line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_master_state_unref0 (_vala_state);
-#line 20383 "Photo.c"
+#line 20442 "Photo.c"
 	}
 #line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20387 "Photo.c"
+#line 20446 "Photo.c"
 }
 
 
@@ -20408,7 +20467,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 20410 "Photo.c"
+#line 20469 "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);
@@ -20416,7 +20475,7 @@ 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 20418 "Photo.c"
+#line 20477 "Photo.c"
 		}
 	}
 }
@@ -20434,13 +20493,13 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
 	PhotoFileMetadataWriter* _tmp5_ = NULL;
 	PhotoFileReader* _tmp6_ = NULL;
 	PhotoFileMetadataWriter* _tmp7_ = NULL;
-	PhotoFileMetadataWriter* _tmp8_ = NULL;
 	PhotoFileMetadataWriter* _tmp9_ = NULL;
-	PhotoMetadata* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
-	PhotoReimportEditableState* _tmp12_ = NULL;
+	PhotoFileMetadataWriter* _tmp10_ = NULL;
+	PhotoMetadata* _tmp11_ = NULL;
 	gboolean _tmp13_ = FALSE;
 	PhotoReimportEditableState* _tmp14_ = NULL;
+	gboolean _tmp15_ = FALSE;
+	PhotoReimportEditableState* _tmp17_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 2678 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -20466,15 +20525,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 20468 "Photo.c"
+#line 20527 "Photo.c"
 		} else {
 #line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20472 "Photo.c"
+#line 20531 "Photo.c"
 		}
 #line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20476 "Photo.c"
+#line 20535 "Photo.c"
 	}
 #line 2686 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = editable_reader;
@@ -20492,15 +20551,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 20494 "Photo.c"
+#line 20553 "Photo.c"
 		} else {
 #line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20498 "Photo.c"
+#line 20557 "Photo.c"
 		}
 #line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20502 "Photo.c"
+#line 20561 "Photo.c"
 	}
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = editable_reader;
@@ -20510,28 +20569,32 @@ 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"
+		gboolean _tmp8_ = 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"
 		_photo_file_adapter_unref0 (editable_reader);
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 20518 "Photo.c"
+		return _tmp8_;
+#line 20579 "Photo.c"
 	}
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp8_ = _tmp5_;
+	_tmp9_ = _tmp5_;
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = NULL;
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp9_ = _tmp8_;
+	_tmp10_ = _tmp9_;
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp10_ = metadata;
+	_tmp11_ = metadata;
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_file_metadata_writer_write_metadata (_tmp9_, _tmp10_, &_inner_error_);
+	photo_file_metadata_writer_write_metadata (_tmp10_, _tmp11_, &_inner_error_);
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
-	_photo_file_adapter_unref0 (_tmp9_);
+	_photo_file_adapter_unref0 (_tmp10_);
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 20595 "Photo.c"
+		gboolean _tmp12_ = 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"
@@ -20539,19 +20602,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 FALSE;
-#line 20542 "Photo.c"
+		return _tmp12_;
+#line 20605 "Photo.c"
 	}
 #line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp13_ = photo_prepare_for_reimport_editable (self, &_tmp12_, &_inner_error_);
+	_tmp15_ = photo_prepare_for_reimport_editable (self, &_tmp14_, &_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 = _tmp12_;
+	_vala_state = _tmp14_;
 #line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp11_ = _tmp13_;
+	_tmp13_ = _tmp15_;
 #line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 20617 "Photo.c"
+		gboolean _tmp16_ = 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"
@@ -20559,11 +20624,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 FALSE;
-#line 20562 "Photo.c"
+		return _tmp16_;
+#line 20627 "Photo.c"
 	}
 #line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (!_tmp11_) {
+	if (!_tmp13_) {
 #line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
 #line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20574,20 +20639,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 20576 "Photo.c"
+#line 20641 "Photo.c"
 		} else {
 #line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20580 "Photo.c"
+#line 20645 "Photo.c"
 		}
 #line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20584 "Photo.c"
+#line 20649 "Photo.c"
 	}
 #line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp14_ = _vala_state;
+	_tmp17_ = _vala_state;
 #line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
-	G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)->metadata_only = TRUE;
+	G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, 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"
@@ -20598,15 +20663,15 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
 	if (state) {
 #line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 20600 "Photo.c"
+#line 20665 "Photo.c"
 	} else {
 #line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20604 "Photo.c"
+#line 20669 "Photo.c"
 	}
 #line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20608 "Photo.c"
+#line 20673 "Photo.c"
 }
 
 
@@ -20629,7 +20694,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 20631 "Photo.c"
+#line 20696 "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);
@@ -20637,7 +20702,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 20639 "Photo.c"
+#line 20704 "Photo.c"
 		}
 	}
 }
@@ -20647,14 +20712,14 @@ 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 20649 "Photo.c"
+#line 20714 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 20656 "Photo.c"
+#line 20721 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			Dimensions _tmp2_ = {0};
@@ -20664,18 +20729,18 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) {
 			_tmp2_ = _tmp1_->dim;
 #line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 20666 "Photo.c"
+#line 20731 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #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 20673 "Photo.c"
+#line 20738 "Photo.c"
 			}
 #line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20677 "Photo.c"
+#line 20742 "Photo.c"
 		}
 		__finally363:
 		{
@@ -20684,7 +20749,7 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) {
 			_tmp4_ = self->row;
 #line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20686 "Photo.c"
+#line 20751 "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);
@@ -20692,7 +20757,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 20694 "Photo.c"
+#line 20759 "Photo.c"
 	}
 }
 
@@ -20702,14 +20767,15 @@ 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 20704 "Photo.c"
+#line 20769 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
+		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 20711 "Photo.c"
+#line 20777 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			PhotoRow* _tmp2_ = NULL;
@@ -20728,7 +20794,7 @@ gboolean photo_has_transformations (Photo* self) {
 			if (_tmp3_ != _tmp5_) {
 #line 2714 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = TRUE;
-#line 20730 "Photo.c"
+#line 20796 "Photo.c"
 			} else {
 				PhotoRow* _tmp6_ = NULL;
 				GeeHashMap* _tmp7_ = NULL;
@@ -20738,22 +20804,22 @@ gboolean photo_has_transformations (Photo* self) {
 				_tmp7_ = _tmp6_->transformations;
 #line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp7_ != NULL;
-#line 20740 "Photo.c"
+#line 20806 "Photo.c"
 			}
 #line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 20744 "Photo.c"
+#line 20810 "Photo.c"
 			{
 				PhotoRow* _tmp8_ = NULL;
 #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 20751 "Photo.c"
+#line 20817 "Photo.c"
 			}
 #line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 20755 "Photo.c"
+#line 20821 "Photo.c"
 		}
 		__finally364:
 		{
@@ -20762,15 +20828,15 @@ gboolean photo_has_transformations (Photo* self) {
 			_tmp9_ = self->row;
 #line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20764 "Photo.c"
+#line 20830 "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);
 #line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 20772 "Photo.c"
+		return _tmp10_;
+#line 20838 "Photo.c"
 	}
 }
 
@@ -20794,7 +20860,7 @@ gboolean photo_only_metadata_changed (Photo* self) {
 	_tmp1_ = metadata;
 #line 2723 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 20796 "Photo.c"
+#line 20862 "Photo.c"
 		PhotoMetadata* _tmp2_ = NULL;
 		MetadataDateTime* _tmp3_ = NULL;
 #line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20805,15 +20871,16 @@ 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 20807 "Photo.c"
+#line 20873 "Photo.c"
 	}
 	{
 		PhotoRow* _tmp4_ = NULL;
+		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 20815 "Photo.c"
+#line 20882 "Photo.c"
 		{
 			gboolean _tmp5_ = FALSE;
 			PhotoRow* _tmp6_ = NULL;
@@ -20824,7 +20891,7 @@ gboolean photo_only_metadata_changed (Photo* self) {
 			_tmp7_ = _tmp6_->transformations;
 #line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp7_ == NULL) {
-#line 20826 "Photo.c"
+#line 20893 "Photo.c"
 				gboolean _tmp8_ = FALSE;
 				PhotoRow* _tmp9_ = NULL;
 				Orientation _tmp10_ = 0;
@@ -20842,7 +20909,7 @@ gboolean photo_only_metadata_changed (Photo* self) {
 				if (_tmp10_ != _tmp12_) {
 #line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp8_ = TRUE;
-#line 20844 "Photo.c"
+#line 20911 "Photo.c"
 				} else {
 					gboolean _tmp13_ = FALSE;
 					MetadataDateTime* _tmp14_ = NULL;
@@ -20850,7 +20917,7 @@ gboolean photo_only_metadata_changed (Photo* self) {
 					_tmp14_ = date_time;
 #line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp14_ != NULL) {
-#line 20852 "Photo.c"
+#line 20919 "Photo.c"
 						PhotoRow* _tmp15_ = NULL;
 						time_t _tmp16_ = 0;
 						MetadataDateTime* _tmp17_ = NULL;
@@ -20865,34 +20932,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 20867 "Photo.c"
+#line 20934 "Photo.c"
 					} else {
 #line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp13_ = FALSE;
-#line 20871 "Photo.c"
+#line 20938 "Photo.c"
 					}
 #line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp8_ = _tmp13_;
-#line 20875 "Photo.c"
+#line 20942 "Photo.c"
 				}
 #line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp8_;
-#line 20879 "Photo.c"
+#line 20946 "Photo.c"
 			} else {
 #line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = FALSE;
-#line 20883 "Photo.c"
+#line 20950 "Photo.c"
 			}
 #line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp5_;
-#line 20887 "Photo.c"
+#line 20954 "Photo.c"
 			{
 				PhotoRow* _tmp19_ = NULL;
 #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 20894 "Photo.c"
+#line 20961 "Photo.c"
 			}
 #line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (metadata);
@@ -20900,7 +20967,7 @@ 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 20902 "Photo.c"
+#line 20969 "Photo.c"
 		}
 		__finally365:
 		{
@@ -20909,7 +20976,7 @@ gboolean photo_only_metadata_changed (Photo* self) {
 			_tmp20_ = self->row;
 #line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20911 "Photo.c"
+#line 20978 "Photo.c"
 		}
 #line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
@@ -20920,14 +20987,14 @@ gboolean photo_only_metadata_changed (Photo* self) {
 #line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 20923 "Photo.c"
+		return _tmp21_;
+#line 20990 "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 20929 "Photo.c"
+#line 20996 "Photo.c"
 }
 
 
@@ -20957,7 +21024,7 @@ gboolean photo_has_alterations (Photo* self) {
 	_tmp1_ = metadata;
 #line 2739 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 20959 "Photo.c"
+#line 21026 "Photo.c"
 		PhotoMetadata* _tmp2_ = NULL;
 		MetadataDateTime* _tmp3_ = NULL;
 		PhotoMetadata* _tmp4_ = NULL;
@@ -20988,20 +21055,20 @@ gboolean photo_has_alterations (Photo* self) {
 		_g_free0 (comment);
 #line 2742 "/home/jens/Source/shotwell/src/Photo.vala"
 		comment = _tmp7_;
-#line 20990 "Photo.c"
+#line 21057 "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 20996 "Photo.c"
+#line 21063 "Photo.c"
 		{
 			PhotoRow* _tmp9_ = NULL;
 #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 21003 "Photo.c"
+#line 21070 "Photo.c"
 			{
 				BackingPhotoRow* _tmp10_ = NULL;
 				time_t _tmp11_ = 0;
@@ -21019,14 +21086,14 @@ gboolean photo_has_alterations (Photo* self) {
 				if (_tmp11_ != _tmp13_) {
 #line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 					result = TRUE;
-#line 21021 "Photo.c"
+#line 21088 "Photo.c"
 					{
 						PhotoRow* _tmp14_ = NULL;
 #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 21028 "Photo.c"
+#line 21095 "Photo.c"
 					}
 #line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (metadata);
@@ -21038,7 +21105,7 @@ gboolean photo_has_alterations (Photo* self) {
 					_metadata_date_time_unref0 (date_time);
 #line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 					return result;
-#line 21040 "Photo.c"
+#line 21107 "Photo.c"
 				}
 			}
 			__finally366:
@@ -21048,10 +21115,12 @@ gboolean photo_has_alterations (Photo* self) {
 				_tmp15_ = self->row;
 #line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21050 "Photo.c"
+#line 21117 "Photo.c"
 			}
 #line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 21121 "Photo.c"
+				gboolean _tmp16_ = FALSE;
 #line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				_media_metadata_unref0 (metadata);
 #line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21065,140 +21134,141 @@ gboolean photo_has_alterations (Photo* self) {
 #line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
 #line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
-				return FALSE;
-#line 21068 "Photo.c"
+				return _tmp16_;
+#line 21137 "Photo.c"
 			}
 		}
 	}
 	{
-		PhotoRow* _tmp16_ = NULL;
+		PhotoRow* _tmp17_ = NULL;
+		gboolean _tmp42_ = FALSE;
 #line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp16_ = self->row;
+		_tmp17_ = self->row;
 #line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21078 "Photo.c"
+#line 21148 "Photo.c"
 		{
-			gboolean _tmp17_ = FALSE;
 			gboolean _tmp18_ = FALSE;
 			gboolean _tmp19_ = FALSE;
 			gboolean _tmp20_ = FALSE;
-			PhotoRow* _tmp21_ = NULL;
-			GeeHashMap* _tmp22_ = NULL;
+			gboolean _tmp21_ = FALSE;
+			PhotoRow* _tmp22_ = NULL;
+			GeeHashMap* _tmp23_ = NULL;
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp21_ = self->row;
+			_tmp22_ = self->row;
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp22_ = _tmp21_->transformations;
+			_tmp23_ = _tmp22_->transformations;
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
-			if (_tmp22_ != NULL) {
+			if (_tmp23_ != NULL) {
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp20_ = TRUE;
-#line 21094 "Photo.c"
+				_tmp21_ = TRUE;
+#line 21164 "Photo.c"
 			} else {
-				PhotoRow* _tmp23_ = NULL;
-				Orientation _tmp24_ = 0;
-				BackingPhotoRow* _tmp25_ = NULL;
-				Orientation _tmp26_ = 0;
+				PhotoRow* _tmp24_ = NULL;
+				Orientation _tmp25_ = 0;
+				BackingPhotoRow* _tmp26_ = NULL;
+				Orientation _tmp27_ = 0;
 #line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp23_ = self->row;
+				_tmp24_ = self->row;
 #line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp24_ = _tmp23_->orientation;
+				_tmp25_ = _tmp24_->orientation;
 #line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp25_ = self->backing_photo_row;
+				_tmp26_ = self->backing_photo_row;
 #line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp26_ = _tmp25_->original_orientation;
+				_tmp27_ = _tmp26_->original_orientation;
 #line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp20_ = _tmp24_ != _tmp26_;
-#line 21110 "Photo.c"
+				_tmp21_ = _tmp25_ != _tmp27_;
+#line 21180 "Photo.c"
 			}
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
-			if (_tmp20_) {
+			if (_tmp21_) {
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp19_ = TRUE;
-#line 21116 "Photo.c"
+				_tmp20_ = TRUE;
+#line 21186 "Photo.c"
 			} else {
-				gboolean _tmp27_ = FALSE;
-				MetadataDateTime* _tmp28_ = NULL;
+				gboolean _tmp28_ = FALSE;
+				MetadataDateTime* _tmp29_ = NULL;
 #line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp28_ = date_time;
+				_tmp29_ = date_time;
 #line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
-				if (_tmp28_ != NULL) {
-#line 21124 "Photo.c"
-					PhotoRow* _tmp29_ = NULL;
-					time_t _tmp30_ = 0;
-					MetadataDateTime* _tmp31_ = NULL;
-					time_t _tmp32_ = 0;
+				if (_tmp29_ != NULL) {
+#line 21194 "Photo.c"
+					PhotoRow* _tmp30_ = NULL;
+					time_t _tmp31_ = 0;
+					MetadataDateTime* _tmp32_ = NULL;
+					time_t _tmp33_ = 0;
 #line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp29_ = self->row;
+					_tmp30_ = self->row;
 #line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp30_ = _tmp29_->exposure_time;
+					_tmp31_ = _tmp30_->exposure_time;
 #line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp31_ = date_time;
+					_tmp32_ = date_time;
 #line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp32_ = metadata_date_time_get_timestamp (_tmp31_);
+					_tmp33_ = metadata_date_time_get_timestamp (_tmp32_);
 #line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp27_ = _tmp30_ != _tmp32_;
-#line 21139 "Photo.c"
+					_tmp28_ = _tmp31_ != _tmp33_;
+#line 21209 "Photo.c"
 				} else {
 #line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp27_ = FALSE;
-#line 21143 "Photo.c"
+					_tmp28_ = FALSE;
+#line 21213 "Photo.c"
 				}
 #line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp19_ = _tmp27_;
-#line 21147 "Photo.c"
+				_tmp20_ = _tmp28_;
+#line 21217 "Photo.c"
 			}
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
-			if (_tmp19_) {
+			if (_tmp20_) {
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp18_ = TRUE;
-#line 21153 "Photo.c"
+				_tmp19_ = TRUE;
+#line 21223 "Photo.c"
 			} else {
-				gchar* _tmp33_ = NULL;
 				gchar* _tmp34_ = NULL;
-				const gchar* _tmp35_ = NULL;
+				gchar* _tmp35_ = NULL;
+				const gchar* _tmp36_ = NULL;
 #line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp33_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
+				_tmp34_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp34_ = _tmp33_;
+				_tmp35_ = _tmp34_;
 #line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp35_ = comment;
+				_tmp36_ = comment;
 #line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp18_ = g_strcmp0 (_tmp34_, _tmp35_) != 0;
+				_tmp19_ = g_strcmp0 (_tmp35_, _tmp36_) != 0;
 #line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
-				_g_free0 (_tmp34_);
-#line 21168 "Photo.c"
+				_g_free0 (_tmp35_);
+#line 21238 "Photo.c"
 			}
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
-			if (_tmp18_) {
+			if (_tmp19_) {
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp17_ = TRUE;
-#line 21174 "Photo.c"
+				_tmp18_ = TRUE;
+#line 21244 "Photo.c"
 			} else {
-				gchar* _tmp36_ = NULL;
 				gchar* _tmp37_ = NULL;
-				const gchar* _tmp38_ = NULL;
+				gchar* _tmp38_ = NULL;
+				const gchar* _tmp39_ = NULL;
 #line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp36_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
+				_tmp37_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp37_ = _tmp36_;
+				_tmp38_ = _tmp37_;
 #line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp38_ = title;
+				_tmp39_ = title;
 #line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp17_ = g_strcmp0 (_tmp37_, _tmp38_) != 0;
+				_tmp18_ = g_strcmp0 (_tmp38_, _tmp39_) != 0;
 #line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
-				_g_free0 (_tmp37_);
-#line 21189 "Photo.c"
+				_g_free0 (_tmp38_);
+#line 21259 "Photo.c"
 			}
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
-			result = _tmp17_;
-#line 21193 "Photo.c"
+			result = _tmp18_;
+#line 21263 "Photo.c"
 			{
-				PhotoRow* _tmp39_ = NULL;
+				PhotoRow* _tmp40_ = NULL;
 #line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp39_ = self->row;
+				_tmp40_ = self->row;
 #line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21200 "Photo.c"
+#line 21270 "Photo.c"
 			}
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (metadata);
@@ -21210,16 +21280,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 21212 "Photo.c"
+#line 21282 "Photo.c"
 		}
 		__finally367:
 		{
-			PhotoRow* _tmp40_ = NULL;
+			PhotoRow* _tmp41_ = NULL;
 #line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp40_ = self->row;
+			_tmp41_ = self->row;
 #line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21221 "Photo.c"
+#line 21291 "Photo.c"
 		}
 #line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
@@ -21234,8 +21304,8 @@ gboolean photo_has_alterations (Photo* self) {
 #line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 21237 "Photo.c"
+		return _tmp42_;
+#line 21307 "Photo.c"
 	}
 #line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
@@ -21245,7 +21315,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 21247 "Photo.c"
+#line 21317 "Photo.c"
 }
 
 
@@ -21254,14 +21324,14 @@ 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 21256 "Photo.c"
+#line 21326 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 21263 "Photo.c"
+#line 21333 "Photo.c"
 		{
 			PixelTransformer* _tmp1_ = NULL;
 			PixelTransformer* _tmp2_ = NULL;
@@ -21276,7 +21346,7 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 			_tmp2_ = self->priv->transformer;
 #line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 21278 "Photo.c"
+#line 21348 "Photo.c"
 				PixelTransformer* _tmp3_ = NULL;
 				PixelTransformer* _tmp4_ = NULL;
 #line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21287,19 +21357,19 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 				_pixel_transformer_unref0 (_tmp1_);
 #line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp4_;
-#line 21289 "Photo.c"
+#line 21359 "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 21295 "Photo.c"
+#line 21365 "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 21301 "Photo.c"
+#line 21371 "Photo.c"
 				PixelTransformationBundle* _tmp7_ = NULL;
 				PixelTransformationBundle* _tmp8_ = NULL;
 #line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21310,13 +21380,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 21312 "Photo.c"
+#line 21382 "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 21318 "Photo.c"
+#line 21388 "Photo.c"
 			}
 #line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
@@ -21334,18 +21404,18 @@ 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 21336 "Photo.c"
+#line 21406 "Photo.c"
 			{
 				PhotoRow* _tmp14_ = NULL;
 #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 21343 "Photo.c"
+#line 21413 "Photo.c"
 			}
 #line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21347 "Photo.c"
+#line 21417 "Photo.c"
 		}
 		__finally368:
 		{
@@ -21354,7 +21424,7 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 			_tmp15_ = self->row;
 #line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21356 "Photo.c"
+#line 21426 "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);
@@ -21362,7 +21432,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 21364 "Photo.c"
+#line 21434 "Photo.c"
 	}
 }
 
@@ -21370,14 +21440,14 @@ 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 21372 "Photo.c"
+#line 21442 "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 21379 "Photo.c"
+#line 21449 "Photo.c"
 }
 
 
@@ -21400,7 +21470,7 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 	PhotoPhotoTransformationStateImpl* _tmp9_ = NULL;
 	PixelTransformationBundle* _tmp10_ = NULL;
 	gboolean committed = FALSE;
-	gboolean _tmp30_ = FALSE;
+	gboolean _tmp31_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -21422,7 +21492,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 21424 "Photo.c"
+#line 21494 "Photo.c"
 	}
 #line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = state_impl;
@@ -21448,14 +21518,14 @@ 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 21450 "Photo.c"
+#line 21520 "Photo.c"
 	{
 		PhotoRow* _tmp11_ = NULL;
 #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 21457 "Photo.c"
+#line 21527 "Photo.c"
 		{
 			PhotoTable* _tmp12_ = NULL;
 			PhotoTable* _tmp13_ = NULL;
@@ -21487,7 +21557,7 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 			_tmp19_ = committed;
 #line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp19_) {
-#line 21489 "Photo.c"
+#line 21559 "Photo.c"
 				PhotoRow* _tmp20_ = NULL;
 				Orientation _tmp21_ = 0;
 				PhotoRow* _tmp22_ = NULL;
@@ -21529,7 +21599,7 @@ 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 21531 "Photo.c"
+#line 21601 "Photo.c"
 			}
 		}
 		__finally369:
@@ -21539,10 +21609,12 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 			_tmp29_ = self->row;
 #line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21541 "Photo.c"
+#line 21611 "Photo.c"
 		}
 #line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 21615 "Photo.c"
+			gboolean _tmp30_ = FALSE;
 #line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformation_bundle_unref0 (saved_adjustments);
 #line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21556,26 +21628,26 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 #line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
 #line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
-			return FALSE;
-#line 21559 "Photo.c"
+			return _tmp30_;
+#line 21631 "Photo.c"
 		}
 	}
 #line 2798 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp30_ = committed;
+	_tmp31_ = committed;
 #line 2798 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp30_) {
-#line 21566 "Photo.c"
-		Alteration* _tmp31_ = NULL;
+	if (_tmp31_) {
+#line 21638 "Photo.c"
 		Alteration* _tmp32_ = NULL;
+		Alteration* _tmp33_ = NULL;
 #line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp31_ = alteration_new ("image", "transformation-state");
+		_tmp32_ = alteration_new ("image", "transformation-state");
 #line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp32_ = _tmp31_;
+		_tmp33_ = _tmp32_;
 #line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
-		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp32_);
+		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 (_tmp32_);
-#line 21577 "Photo.c"
+		_alteration_unref0 (_tmp33_);
+#line 21649 "Photo.c"
 	}
 #line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = committed;
@@ -21589,7 +21661,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 21591 "Photo.c"
+#line 21663 "Photo.c"
 }
 
 
@@ -21598,7 +21670,7 @@ 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 21600 "Photo.c"
+#line 21672 "Photo.c"
 }
 
 
@@ -21611,14 +21683,14 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 	g_return_if_fail (IS_PHOTO (self));
 #line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_altered = FALSE;
-#line 21613 "Photo.c"
+#line 21685 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 21620 "Photo.c"
+#line 21692 "Photo.c"
 		{
 			PhotoTable* _tmp1_ = NULL;
 			PhotoTable* _tmp2_ = NULL;
@@ -21668,7 +21740,7 @@ 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 21670 "Photo.c"
+#line 21742 "Photo.c"
 				PhotoTable* _tmp11_ = NULL;
 				PhotoTable* _tmp12_ = NULL;
 				PhotoRow* _tmp13_ = NULL;
@@ -21704,7 +21776,7 @@ 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 21706 "Photo.c"
+#line 21778 "Photo.c"
 			}
 		}
 		__finally370:
@@ -21714,7 +21786,7 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 			_tmp20_ = self->row;
 #line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21716 "Photo.c"
+#line 21788 "Photo.c"
 		}
 #line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -21724,28 +21796,28 @@ 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 21726 "Photo.c"
+#line 21798 "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 21733 "Photo.c"
+#line 21805 "Photo.c"
 		gboolean _tmp23_ = FALSE;
 #line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = notify;
 #line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp23_;
-#line 21739 "Photo.c"
+#line 21811 "Photo.c"
 	} else {
 #line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = FALSE;
-#line 21743 "Photo.c"
+#line 21815 "Photo.c"
 	}
 #line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp21_) {
-#line 21747 "Photo.c"
+#line 21819 "Photo.c"
 		Alteration* _tmp24_ = NULL;
 		Alteration* _tmp25_ = NULL;
 #line 2826 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21756,7 +21828,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 21758 "Photo.c"
+#line 21830 "Photo.c"
 	}
 }
 
@@ -21766,14 +21838,14 @@ 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 21768 "Photo.c"
+#line 21840 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 21775 "Photo.c"
+#line 21847 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			Orientation _tmp2_ = 0;
@@ -21783,18 +21855,18 @@ Orientation photo_get_original_orientation (Photo* self) {
 			_tmp2_ = _tmp1_->original_orientation;
 #line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 21785 "Photo.c"
+#line 21857 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #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 21792 "Photo.c"
+#line 21864 "Photo.c"
 			}
 #line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21796 "Photo.c"
+#line 21868 "Photo.c"
 		}
 		__finally371:
 		{
@@ -21803,7 +21875,7 @@ Orientation photo_get_original_orientation (Photo* self) {
 			_tmp4_ = self->row;
 #line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21805 "Photo.c"
+#line 21877 "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);
@@ -21811,7 +21883,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 21813 "Photo.c"
+#line 21885 "Photo.c"
 	}
 }
 
@@ -21821,14 +21893,14 @@ 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 21823 "Photo.c"
+#line 21895 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 21830 "Photo.c"
+#line 21902 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			Orientation _tmp2_ = 0;
@@ -21838,18 +21910,18 @@ Orientation photo_get_orientation (Photo* self) {
 			_tmp2_ = _tmp1_->orientation;
 #line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 21840 "Photo.c"
+#line 21912 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #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 21847 "Photo.c"
+#line 21919 "Photo.c"
 			}
 #line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21851 "Photo.c"
+#line 21923 "Photo.c"
 		}
 		__finally372:
 		{
@@ -21858,7 +21930,7 @@ Orientation photo_get_orientation (Photo* self) {
 			_tmp4_ = self->row;
 #line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21860 "Photo.c"
+#line 21932 "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);
@@ -21866,7 +21938,7 @@ Orientation photo_get_orientation (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 21868 "Photo.c"
+#line 21940 "Photo.c"
 	}
 }
 
@@ -21874,20 +21946,20 @@ Orientation photo_get_orientation (Photo* self) {
 gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 	gboolean result = FALSE;
 	gboolean committed = FALSE;
-	gboolean _tmp14_ = FALSE;
+	gboolean _tmp15_ = FALSE;
 	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 21882 "Photo.c"
+#line 21954 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 21889 "Photo.c"
+#line 21961 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			Orientation _tmp2_ = 0;
@@ -21900,7 +21972,7 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 			_tmp3_ = orientation;
 #line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != _tmp3_) {
-#line 21902 "Photo.c"
+#line 21974 "Photo.c"
 				PhotoTable* _tmp4_ = NULL;
 				PhotoTable* _tmp5_ = NULL;
 				PhotoRow* _tmp6_ = NULL;
@@ -21928,7 +22000,7 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 				_tmp10_ = committed;
 #line 2846 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp10_) {
-#line 21930 "Photo.c"
+#line 22002 "Photo.c"
 					PhotoRow* _tmp11_ = NULL;
 					Orientation _tmp12_ = 0;
 #line 2847 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21937,7 +22009,7 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 					_tmp12_ = orientation;
 #line 2847 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_->orientation = _tmp12_;
-#line 21939 "Photo.c"
+#line 22011 "Photo.c"
 				}
 			}
 		}
@@ -21948,41 +22020,43 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 			_tmp13_ = self->row;
 #line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21950 "Photo.c"
+#line 22022 "Photo.c"
 		}
 #line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 22026 "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);
 #line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
 #line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
-			return FALSE;
-#line 21960 "Photo.c"
+			return _tmp14_;
+#line 22034 "Photo.c"
 		}
 	}
 #line 2851 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp14_ = committed;
+	_tmp15_ = committed;
 #line 2851 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp14_) {
-#line 21967 "Photo.c"
-		Alteration* _tmp15_ = NULL;
+	if (_tmp15_) {
+#line 22041 "Photo.c"
 		Alteration* _tmp16_ = NULL;
+		Alteration* _tmp17_ = NULL;
 #line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp15_ = alteration_new ("image", "orientation");
+		_tmp16_ = alteration_new ("image", "orientation");
 #line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp16_ = _tmp15_;
+		_tmp17_ = _tmp16_;
 #line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
-		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp16_);
+		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 (_tmp16_);
-#line 21978 "Photo.c"
+		_alteration_unref0 (_tmp17_);
+#line 22052 "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 21984 "Photo.c"
+#line 22058 "Photo.c"
 }
 
 
@@ -21997,7 +22071,7 @@ gboolean photo_check_can_rotate (Photo* self) {
 	result = _tmp0_;
 #line 2858 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 21999 "Photo.c"
+#line 22073 "Photo.c"
 }
 
 
@@ -22009,7 +22083,7 @@ static void photo_real_rotate (Photo* self, Rotation rotation) {
 		_tmp0_ = self->row;
 #line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22011 "Photo.c"
+#line 22085 "Photo.c"
 		{
 			Orientation _tmp1_ = 0;
 			Rotation _tmp2_ = 0;
@@ -22022,7 +22096,7 @@ 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 22024 "Photo.c"
+#line 22098 "Photo.c"
 		}
 		__finally374:
 		{
@@ -22031,7 +22105,7 @@ static void photo_real_rotate (Photo* self, Rotation rotation) {
 			_tmp4_ = self->row;
 #line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22033 "Photo.c"
+#line 22107 "Photo.c"
 		}
 #line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -22041,7 +22115,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 22043 "Photo.c"
+#line 22117 "Photo.c"
 		}
 	}
 }
@@ -22052,7 +22126,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 22054 "Photo.c"
+#line 22128 "Photo.c"
 }
 
 
@@ -22063,14 +22137,15 @@ 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 22065 "Photo.c"
+#line 22139 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
+		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 22072 "Photo.c"
+#line 22147 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			PhotoRow* _tmp2_ = NULL;
@@ -22081,7 +22156,7 @@ static gboolean photo_has_transformation (Photo* self, const gchar* name) {
 			_tmp3_ = _tmp2_->transformations;
 #line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ != NULL) {
-#line 22083 "Photo.c"
+#line 22158 "Photo.c"
 				PhotoRow* _tmp4_ = NULL;
 				GeeHashMap* _tmp5_ = NULL;
 				const gchar* _tmp6_ = NULL;
@@ -22096,26 +22171,26 @@ 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 22098 "Photo.c"
+#line 22173 "Photo.c"
 			} else {
 #line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 22102 "Photo.c"
+#line 22177 "Photo.c"
 			}
 #line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 22106 "Photo.c"
+#line 22181 "Photo.c"
 			{
 				PhotoRow* _tmp8_ = NULL;
 #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 22113 "Photo.c"
+#line 22188 "Photo.c"
 			}
 #line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 22117 "Photo.c"
+#line 22192 "Photo.c"
 		}
 		__finally375:
 		{
@@ -22124,15 +22199,15 @@ static gboolean photo_has_transformation (Photo* self, const gchar* name) {
 			_tmp9_ = self->row;
 #line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22126 "Photo.c"
+#line 22201 "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);
 #line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 22134 "Photo.c"
+		return _tmp10_;
+#line 22209 "Photo.c"
 	}
 }
 
@@ -22147,14 +22222,14 @@ 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 22149 "Photo.c"
+#line 22224 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 22156 "Photo.c"
+#line 22231 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_ = NULL;
@@ -22164,7 +22239,7 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) {
 			_tmp2_ = _tmp1_->transformations;
 #line 2879 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 22166 "Photo.c"
+#line 22241 "Photo.c"
 				PhotoRow* _tmp3_ = NULL;
 				GeeHashMap* _tmp4_ = NULL;
 				const gchar* _tmp5_ = NULL;
@@ -22186,7 +22261,7 @@ 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 22188 "Photo.c"
+#line 22263 "Photo.c"
 					KeyValueMap* _tmp8_ = NULL;
 					KeyValueMap* _tmp9_ = NULL;
 #line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22197,7 +22272,7 @@ 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 22199 "Photo.c"
+#line 22274 "Photo.c"
 				}
 			}
 		}
@@ -22208,7 +22283,7 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) {
 			_tmp10_ = self->row;
 #line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22210 "Photo.c"
+#line 22285 "Photo.c"
 		}
 #line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -22220,14 +22295,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 22222 "Photo.c"
+#line 22297 "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 22229 "Photo.c"
+#line 22304 "Photo.c"
 }
 
 
@@ -22238,14 +22313,15 @@ 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 22240 "Photo.c"
+#line 22315 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
+		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 22247 "Photo.c"
+#line 22323 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_ = NULL;
@@ -22268,18 +22344,18 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
 			_tmp2_ = _tmp1_->transformations;
 #line 2891 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ == NULL) {
-#line 22270 "Photo.c"
+#line 22346 "Photo.c"
 				PhotoRow* _tmp3_ = NULL;
 				GeeHashMap* _tmp4_ = NULL;
 #line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp4_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+				_tmp4_ = 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 2892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp3_->transformations);
 #line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_->transformations = _tmp4_;
-#line 22281 "Photo.c"
+#line 22357 "Photo.c"
 			}
 #line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
@@ -22315,18 +22391,18 @@ 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 22317 "Photo.c"
+#line 22393 "Photo.c"
 			{
 				PhotoRow* _tmp18_ = NULL;
 #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 22324 "Photo.c"
+#line 22400 "Photo.c"
 			}
 #line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 22328 "Photo.c"
+#line 22404 "Photo.c"
 		}
 		__finally377:
 		{
@@ -22335,15 +22411,15 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
 			_tmp19_ = self->row;
 #line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22337 "Photo.c"
+#line 22413 "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);
 #line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 22345 "Photo.c"
+		return _tmp20_;
+#line 22421 "Photo.c"
 	}
 }
 
@@ -22352,21 +22428,21 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 	gboolean result = FALSE;
 	gboolean altered_cache = FALSE;
 	gboolean altered_persistent = FALSE;
-	gboolean _tmp19_ = FALSE;
 	gboolean _tmp20_ = FALSE;
+	gboolean _tmp21_ = FALSE;
 	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 22361 "Photo.c"
+#line 22437 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 22368 "Photo.c"
+#line 22444 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_ = NULL;
@@ -22382,7 +22458,7 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 			_tmp2_ = _tmp1_->transformations;
 #line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 22384 "Photo.c"
+#line 22460 "Photo.c"
 				PhotoRow* _tmp3_ = NULL;
 				GeeHashMap* _tmp4_ = NULL;
 				const gchar* _tmp5_ = NULL;
@@ -22406,12 +22482,12 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 #line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _tmp7_->transformations;
 #line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp9_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_MAP, GeeMap));
+				_tmp9_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp9_;
 #line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp10_ == 0) {
-#line 22413 "Photo.c"
+#line 22489 "Photo.c"
 					PhotoRow* _tmp11_ = NULL;
 #line 2906 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = self->row;
@@ -22419,12 +22495,12 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 					_g_object_unref0 (_tmp11_->transformations);
 #line 2906 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_->transformations = NULL;
-#line 22421 "Photo.c"
+#line 22497 "Photo.c"
 				}
 			} else {
 #line 2908 "/home/jens/Source/shotwell/src/Photo.vala"
 				altered_cache = FALSE;
-#line 22426 "Photo.c"
+#line 22502 "Photo.c"
 			}
 #line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_table_get_instance ();
@@ -22442,7 +22518,7 @@ 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 22444 "Photo.c"
+#line 22520 "Photo.c"
 		}
 		__finally378:
 		{
@@ -22451,36 +22527,38 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 			_tmp18_ = self->row;
 #line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22453 "Photo.c"
+#line 22529 "Photo.c"
 		}
 #line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 22533 "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);
 #line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
 #line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
-			return FALSE;
-#line 22463 "Photo.c"
+			return _tmp19_;
+#line 22541 "Photo.c"
 		}
 	}
 #line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp20_ = altered_cache;
+	_tmp21_ = altered_cache;
 #line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp20_) {
+	if (_tmp21_) {
 #line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp19_ = TRUE;
-#line 22472 "Photo.c"
+		_tmp20_ = TRUE;
+#line 22550 "Photo.c"
 	} else {
 #line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp19_ = altered_persistent;
-#line 22476 "Photo.c"
+		_tmp20_ = altered_persistent;
+#line 22554 "Photo.c"
 	}
 #line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
-	result = _tmp19_;
+	result = _tmp20_;
 #line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22482 "Photo.c"
+#line 22560 "Photo.c"
 }
 
 
@@ -22495,7 +22573,7 @@ gboolean photo_has_crop (Photo* self) {
 	result = _tmp0_;
 #line 2919 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22497 "Photo.c"
+#line 22575 "Photo.c"
 }
 
 
@@ -22545,11 +22623,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 22547 "Photo.c"
+#line 22625 "Photo.c"
 		}
 #line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22551 "Photo.c"
+#line 22629 "Photo.c"
 	}
 #line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = map;
@@ -22581,40 +22659,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 22583 "Photo.c"
+#line 22661 "Photo.c"
 	} else {
 		gint _tmp14_ = 0;
 #line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = top;
 #line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp14_ == -1;
-#line 22590 "Photo.c"
+#line 22668 "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 22596 "Photo.c"
+#line 22674 "Photo.c"
 	} else {
 		gint _tmp15_ = 0;
 #line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = right;
 #line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _tmp15_ == -1;
-#line 22603 "Photo.c"
+#line 22681 "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 22609 "Photo.c"
+#line 22687 "Photo.c"
 	} else {
 		gint _tmp16_ = 0;
 #line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = bottom;
 #line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _tmp16_ == -1;
-#line 22616 "Photo.c"
+#line 22694 "Photo.c"
 	}
 #line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_) {
@@ -22626,11 +22704,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 22628 "Photo.c"
+#line 22706 "Photo.c"
 		}
 #line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22632 "Photo.c"
+#line 22710 "Photo.c"
 	}
 #line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = left;
@@ -22650,11 +22728,11 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) {
 	if (crop) {
 #line 2940 "/home/jens/Source/shotwell/src/Photo.vala"
 		*crop = _vala_crop;
-#line 22652 "Photo.c"
+#line 22730 "Photo.c"
 	}
 #line 2940 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22656 "Photo.c"
+#line 22734 "Photo.c"
 }
 
 
@@ -22721,7 +22799,7 @@ 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 22723 "Photo.c"
+#line 22801 "Photo.c"
 		Alteration* _tmp15_ = NULL;
 		Alteration* _tmp16_ = NULL;
 #line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22732,11 +22810,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 22734 "Photo.c"
+#line 22812 "Photo.c"
 	}
 #line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 22738 "Photo.c"
+#line 22816 "Photo.c"
 }
 
 
@@ -22768,11 +22846,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 22770 "Photo.c"
+#line 22848 "Photo.c"
 		}
 #line 2960 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22774 "Photo.c"
+#line 22852 "Photo.c"
 	}
 #line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = map;
@@ -22788,11 +22866,11 @@ 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 22790 "Photo.c"
+#line 22868 "Photo.c"
 	}
 #line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22794 "Photo.c"
+#line 22872 "Photo.c"
 }
 
 
@@ -22821,7 +22899,7 @@ 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 22823 "Photo.c"
+#line 22901 "Photo.c"
 		Alteration* _tmp5_ = NULL;
 		Alteration* _tmp6_ = NULL;
 #line 2973 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22832,11 +22910,11 @@ 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 22834 "Photo.c"
+#line 22912 "Photo.c"
 	}
 #line 2968 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 22838 "Photo.c"
+#line 22916 "Photo.c"
 }
 
 
@@ -22868,7 +22946,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 	_tmp1_ = map;
 #line 2980 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 22870 "Photo.c"
+#line 22948 "Photo.c"
 		EditingToolsRedeyeInstance* _tmp2_ = NULL;
 		EditingToolsRedeyeInstance* _tmp3_ = NULL;
 		gint _tmp3__length1 = 0;
@@ -22882,7 +22960,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 22884 "Photo.c"
+#line 22962 "Photo.c"
 		}
 #line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp3_;
@@ -22890,7 +22968,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 22892 "Photo.c"
+#line 22970 "Photo.c"
 	}
 #line 2983 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = map;
@@ -22920,19 +22998,19 @@ 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 22922 "Photo.c"
+#line 23000 "Photo.c"
 	{
 		gint i = 0;
 #line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 		i = 0;
-#line 22927 "Photo.c"
+#line 23005 "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 22934 "Photo.c"
+#line 23012 "Photo.c"
 				gint _tmp12_ = 0;
 				gint _tmp13_ = 0;
 				gchar* center_key = NULL;
@@ -22977,13 +23055,13 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 				gint _tmp46_ = 0;
 #line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp10_) {
-#line 22979 "Photo.c"
+#line 23057 "Photo.c"
 					gint _tmp11_ = 0;
 #line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = i;
 #line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 					i = _tmp11_ + 1;
-#line 22985 "Photo.c"
+#line 23063 "Photo.c"
 				}
 #line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = FALSE;
@@ -22995,7 +23073,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 				if (!(_tmp12_ < _tmp13_)) {
 #line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 22997 "Photo.c"
+#line 23075 "Photo.c"
 				}
 #line 2993 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = i;
@@ -23091,7 +23169,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 23093 "Photo.c"
+#line 23171 "Photo.c"
 			}
 		}
 	}
@@ -23103,7 +23181,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 23105 "Photo.c"
+#line 23183 "Photo.c"
 	}
 #line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp47_;
@@ -23111,7 +23189,7 @@ 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 23113 "Photo.c"
+#line 23191 "Photo.c"
 }
 
 
@@ -23126,7 +23204,7 @@ gboolean photo_has_redeye_transformations (Photo* self) {
 	result = _tmp0_;
 #line 3008 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23128 "Photo.c"
+#line 23206 "Photo.c"
 }
 
 
@@ -23169,7 +23247,7 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye)
 	_tmp1_ = map;
 #line 3014 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 23171 "Photo.c"
+#line 23249 "Photo.c"
 		KeyValueMap* _tmp2_ = NULL;
 		KeyValueMap* _tmp3_ = NULL;
 #line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23182,7 +23260,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 23184 "Photo.c"
+#line 23262 "Photo.c"
 	}
 #line 3019 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = map;
@@ -23242,7 +23320,7 @@ 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 23244 "Photo.c"
+#line 23322 "Photo.c"
 		Alteration* _tmp24_ = NULL;
 		Alteration* _tmp25_ = NULL;
 #line 3033 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23253,7 +23331,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 23255 "Photo.c"
+#line 23333 "Photo.c"
 	}
 #line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (center_key);
@@ -23261,7 +23339,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 23263 "Photo.c"
+#line 23341 "Photo.c"
 }
 
 
@@ -23274,14 +23352,15 @@ 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 23276 "Photo.c"
+#line 23354 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
+		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 23283 "Photo.c"
+#line 23362 "Photo.c"
 		{
 			Scaling _tmp1_ = {0};
 			PhotoException _tmp2_ = 0;
@@ -23300,30 +23379,30 @@ 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 23302 "Photo.c"
+#line 23381 "Photo.c"
 			{
 				PhotoRow* _tmp6_ = NULL;
 #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 23309 "Photo.c"
+#line 23388 "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 23315 "Photo.c"
+#line 23394 "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 23321 "Photo.c"
+#line 23400 "Photo.c"
 			}
 #line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 23325 "Photo.c"
+#line 23404 "Photo.c"
 		}
 		__finally379:
 		{
@@ -23332,27 +23411,27 @@ static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling
 			_tmp7_ = self->row;
 #line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 23334 "Photo.c"
+#line 23413 "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);
 #line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 23342 "Photo.c"
+		return _tmp8_;
+#line 23421 "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 23348 "Photo.c"
+#line 23427 "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 23354 "Photo.c"
+#line 23433 "Photo.c"
 	}
 }
 
@@ -23388,7 +23467,7 @@ 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 23390 "Photo.c"
+#line 23469 "Photo.c"
 		Dimensions _tmp2_ = {0};
 		Dimensions _tmp3_ = {0};
 #line 3062 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23405,17 +23484,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 23407 "Photo.c"
+#line 23486 "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 23413 "Photo.c"
+#line 23492 "Photo.c"
 		}
 #line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23417 "Photo.c"
+#line 23496 "Photo.c"
 	}
 #line 3068 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_get_orientation (self);
@@ -23431,7 +23510,7 @@ 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 23433 "Photo.c"
+#line 23512 "Photo.c"
 		Box crop = {0};
 		Box _tmp7_ = {0};
 		gboolean _tmp8_ = FALSE;
@@ -23441,7 +23520,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 		crop = _tmp7_;
 #line 3078 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp8_) {
-#line 23443 "Photo.c"
+#line 23522 "Photo.c"
 			Dimensions rotated_raw = {0};
 			Dimensions _tmp9_ = {0};
 			PhotoException _tmp10_ = 0;
@@ -23469,7 +23548,7 @@ 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 23471 "Photo.c"
+#line 23550 "Photo.c"
 				Orientation _tmp12_ = 0;
 				Dimensions _tmp13_ = {0};
 				Box _tmp14_ = {0};
@@ -23495,7 +23574,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 23497 "Photo.c"
+#line 23576 "Photo.c"
 			}
 #line 3088 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&crop, &_tmp19_);
@@ -23515,7 +23594,7 @@ 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 23517 "Photo.c"
+#line 23596 "Photo.c"
 				gint _tmp26_ = 0;
 				gint _tmp27_ = 0;
 #line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23524,15 +23603,15 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 				_tmp27_ = box_get_height (&scaled_crop);
 #line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = _tmp26_ <= _tmp27_;
-#line 23526 "Photo.c"
+#line 23605 "Photo.c"
 			} else {
 #line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = FALSE;
-#line 23530 "Photo.c"
+#line 23609 "Photo.c"
 			}
 #line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp23_) {
-#line 23534 "Photo.c"
+#line 23613 "Photo.c"
 				Dimensions _tmp28_ = {0};
 				Dimensions _tmp29_ = {0};
 #line 3096 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23549,17 +23628,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 23551 "Photo.c"
+#line 23630 "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 23557 "Photo.c"
+#line 23636 "Photo.c"
 				}
 #line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 23561 "Photo.c"
+#line 23640 "Photo.c"
 			}
 #line 3104 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&crop, &_tmp30_);
@@ -23575,7 +23654,7 @@ 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 23577 "Photo.c"
+#line 23656 "Photo.c"
 				Orientation _tmp35_ = 0;
 				Dimensions _tmp36_ = {0};
 				Dimensions _tmp37_ = {0};
@@ -23587,7 +23666,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 23589 "Photo.c"
+#line 23668 "Photo.c"
 			}
 		}
 	}
@@ -23595,7 +23674,7 @@ 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 23597 "Photo.c"
+#line 23676 "Photo.c"
 		Dimensions rotated_raw = {0};
 		Dimensions _tmp39_ = {0};
 		PhotoException _tmp40_ = 0;
@@ -23615,7 +23694,7 @@ 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 23617 "Photo.c"
+#line 23696 "Photo.c"
 			Orientation _tmp42_ = 0;
 			Dimensions _tmp43_ = {0};
 			Dimensions _tmp44_ = {0};
@@ -23627,7 +23706,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 23629 "Photo.c"
+#line 23708 "Photo.c"
 		}
 #line 3120 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = rotated_raw;
@@ -23645,7 +23724,7 @@ 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 23647 "Photo.c"
+#line 23726 "Photo.c"
 			Orientation _tmp50_ = 0;
 			Dimensions _tmp51_ = {0};
 			Dimensions _tmp52_ = {0};
@@ -23657,7 +23736,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 23659 "Photo.c"
+#line 23738 "Photo.c"
 		}
 	}
 #line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23670,7 +23749,7 @@ 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 23672 "Photo.c"
+#line 23751 "Photo.c"
 		Dimensions _tmp58_ = {0};
 		gint _tmp59_ = 0;
 		Dimensions _tmp60_ = {0};
@@ -23685,15 +23764,15 @@ 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 23687 "Photo.c"
+#line 23766 "Photo.c"
 	} else {
 #line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = FALSE;
-#line 23691 "Photo.c"
+#line 23770 "Photo.c"
 	}
 #line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp53_) {
-#line 23695 "Photo.c"
+#line 23774 "Photo.c"
 		Dimensions _tmp62_ = {0};
 #line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp62_ = raw;
@@ -23705,17 +23784,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 23707 "Photo.c"
+#line 23786 "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 23713 "Photo.c"
+#line 23792 "Photo.c"
 		}
 #line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23717 "Photo.c"
+#line 23796 "Photo.c"
 	}
 #line 3135 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp63_ = dimensions_has_area (&_vala_scaled_image);
@@ -23731,17 +23810,17 @@ 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 23733 "Photo.c"
+#line 23812 "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 23739 "Photo.c"
+#line 23818 "Photo.c"
 	}
 #line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23743 "Photo.c"
+#line 23822 "Photo.c"
 }
 
 
@@ -23783,7 +23862,7 @@ 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 23785 "Photo.c"
+#line 23864 "Photo.c"
 		GdkPixbuf* _tmp3_ = NULL;
 		PhotoFileReader* _tmp4_ = NULL;
 		GdkPixbuf* _tmp5_ = NULL;
@@ -23802,7 +23881,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 23804 "Photo.c"
+#line 23883 "Photo.c"
 		}
 #line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp3_;
@@ -23816,7 +23895,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 23818 "Photo.c"
+#line 23897 "Photo.c"
 	}
 #line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = *scaling;
@@ -23834,7 +23913,7 @@ 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 23836 "Photo.c"
+#line 23915 "Photo.c"
 		GdkPixbuf* _tmp13_ = NULL;
 		PhotoFileReader* _tmp14_ = NULL;
 		GdkPixbuf* _tmp15_ = NULL;
@@ -23853,7 +23932,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 23855 "Photo.c"
+#line 23934 "Photo.c"
 		}
 #line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp13_;
@@ -23867,7 +23946,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 23869 "Photo.c"
+#line 23948 "Photo.c"
 	}
 #line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = loader;
@@ -23887,7 +23966,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 23889 "Photo.c"
+#line 23968 "Photo.c"
 	}
 #line 3178 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = pixbuf;
@@ -23903,7 +23982,7 @@ 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 23905 "Photo.c"
+#line 23984 "Photo.c"
 }
 
 
@@ -23933,7 +24012,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 23935 "Photo.c"
+#line 24014 "Photo.c"
 	}
 #line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp0_;
@@ -23945,7 +24024,7 @@ 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 23947 "Photo.c"
+#line 24026 "Photo.c"
 }
 
 
@@ -23975,7 +24054,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 23977 "Photo.c"
+#line 24056 "Photo.c"
 	}
 #line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp0_;
@@ -23987,7 +24066,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 23989 "Photo.c"
+#line 24068 "Photo.c"
 }
 
 
@@ -24006,14 +24085,14 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling,
 	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 24008 "Photo.c"
+#line 24087 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 24015 "Photo.c"
+#line 24094 "Photo.c"
 		{
 			Scaling _tmp1_ = {0};
 			Dimensions _tmp2_ = {0};
@@ -24031,7 +24110,7 @@ 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 24033 "Photo.c"
+#line 24112 "Photo.c"
 		}
 		__finally380:
 		{
@@ -24040,7 +24119,7 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling,
 			_tmp5_ = self->row;
 #line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 24042 "Photo.c"
+#line 24121 "Photo.c"
 		}
 #line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -24048,7 +24127,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 24050 "Photo.c"
+#line 24129 "Photo.c"
 		}
 	}
 #line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24065,13 +24144,13 @@ 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 24067 "Photo.c"
+#line 24146 "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 24073 "Photo.c"
+#line 24152 "Photo.c"
 		GdkPixbuf* _tmp10_ = NULL;
 		GdkPixbuf* _tmp11_ = NULL;
 #line 3223 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24082,13 +24161,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 24084 "Photo.c"
+#line 24163 "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 24090 "Photo.c"
+#line 24169 "Photo.c"
 }
 
 
@@ -24116,7 +24195,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 24118 "Photo.c"
+#line 24197 "Photo.c"
 	}
 #line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp0_;
@@ -24128,7 +24207,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 24130 "Photo.c"
+#line 24209 "Photo.c"
 }
 
 
@@ -24150,7 +24229,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 24152 "Photo.c"
+#line 24231 "Photo.c"
 }
 
 
@@ -24159,7 +24238,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 24161 "Photo.c"
+#line 24240 "Photo.c"
 }
 
 
@@ -24168,14 +24247,14 @@ 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 24170 "Photo.c"
+#line 24249 "Photo.c"
 	{
 		GeeLinkedList* _tmp0_ = NULL;
 #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 24177 "Photo.c"
+#line 24256 "Photo.c"
 		{
 			PhotoCachedPixbuf* found = NULL;
 			gdouble min_elapsed = 0.0;
@@ -24209,7 +24288,7 @@ 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 24211 "Photo.c"
+#line 24290 "Photo.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				PhotoCachedPixbuf* cached_pixbuf = NULL;
@@ -24230,7 +24309,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 24232 "Photo.c"
+#line 24311 "Photo.c"
 				}
 #line 3264 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = iter;
@@ -24252,7 +24331,7 @@ 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 24254 "Photo.c"
+#line 24333 "Photo.c"
 					PhotoCachedPixbuf* _tmp13_ = NULL;
 					Photo* _tmp14_ = NULL;
 					Photo* _tmp15_ = NULL;
@@ -24267,15 +24346,15 @@ 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 24269 "Photo.c"
+#line 24348 "Photo.c"
 				} else {
 #line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = FALSE;
-#line 24273 "Photo.c"
+#line 24352 "Photo.c"
 				}
 #line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp11_) {
-#line 24277 "Photo.c"
+#line 24356 "Photo.c"
 					GeeIterator* _tmp17_ = NULL;
 					PhotoCachedPixbuf* _tmp18_ = NULL;
 					PhotoCachedPixbuf* _tmp19_ = NULL;
@@ -24296,33 +24375,33 @@ 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 24298 "Photo.c"
+#line 24377 "Photo.c"
 				} else {
 					gdouble _tmp21_ = 0.0;
 #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 24305 "Photo.c"
+#line 24384 "Photo.c"
 						GeeIterator* _tmp22_ = NULL;
 #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 24311 "Photo.c"
+#line 24390 "Photo.c"
 					} else {
 						gint _tmp23_ = 0;
 #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 24318 "Photo.c"
+#line 24397 "Photo.c"
 							GeeIterator* _tmp24_ = NULL;
 #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 24324 "Photo.c"
+#line 24403 "Photo.c"
 						} else {
 							gdouble _tmp25_ = 0.0;
 							gdouble _tmp26_ = 0.0;
@@ -24340,47 +24419,47 @@ 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 24342 "Photo.c"
+#line 24421 "Photo.c"
 						}
 					}
 				}
 #line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_cached_pixbuf_unref0 (cached_pixbuf);
-#line 24348 "Photo.c"
+#line 24427 "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 24354 "Photo.c"
+#line 24433 "Photo.c"
 				Photo* _tmp32_ = NULL;
 #line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = locate;
 #line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = _tmp32_ != NULL;
-#line 24360 "Photo.c"
+#line 24439 "Photo.c"
 			} else {
 #line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = FALSE;
-#line 24364 "Photo.c"
+#line 24443 "Photo.c"
 			}
 #line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp30_) {
-#line 24368 "Photo.c"
+#line 24447 "Photo.c"
 				gboolean _tmp33_ = FALSE;
 #line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = keep;
 #line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = _tmp33_;
-#line 24374 "Photo.c"
+#line 24453 "Photo.c"
 			} else {
 #line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = FALSE;
-#line 24378 "Photo.c"
+#line 24457 "Photo.c"
 			}
 #line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp29_) {
-#line 24382 "Photo.c"
+#line 24461 "Photo.c"
 				GdkPixbuf* _tmp34_ = NULL;
 				Photo* _tmp35_ = NULL;
 				Scaling _tmp36_ = {0};
@@ -24401,7 +24480,7 @@ 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 24403 "Photo.c"
+#line 24482 "Photo.c"
 					goto __finally381;
 				}
 #line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24414,14 +24493,14 @@ 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 24416 "Photo.c"
+#line 24495 "Photo.c"
 			} else {
 				PhotoCachedPixbuf* _tmp40_ = NULL;
 #line 3291 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp40_ = found;
 #line 3291 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp40_ != NULL) {
-#line 24423 "Photo.c"
+#line 24502 "Photo.c"
 					PhotoCachedPixbuf* _tmp41_ = NULL;
 					GTimer* _tmp42_ = NULL;
 #line 3293 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24430,28 +24509,28 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 					_tmp42_ = _tmp41_->last_touched;
 #line 3293 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_timer_start (_tmp42_);
-#line 24432 "Photo.c"
+#line 24511 "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 24439 "Photo.c"
+#line 24518 "Photo.c"
 				gboolean _tmp45_ = FALSE;
 #line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = keep;
 #line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = _tmp45_;
-#line 24445 "Photo.c"
+#line 24524 "Photo.c"
 			} else {
 #line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = FALSE;
-#line 24449 "Photo.c"
+#line 24528 "Photo.c"
 			}
 #line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp43_) {
-#line 24453 "Photo.c"
+#line 24532 "Photo.c"
 				GeeLinkedList* _tmp46_ = NULL;
 				PhotoCachedPixbuf* _tmp47_ = NULL;
 				PhotoCachedPixbuf* _tmp48_ = NULL;
@@ -24479,7 +24558,7 @@ 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 24481 "Photo.c"
+#line 24560 "Photo.c"
 					GeeLinkedList* _tmp53_ = NULL;
 					gint _tmp54_ = 0;
 					gint _tmp55_ = 0;
@@ -24489,14 +24568,14 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 #line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp53_ = photo_source_pixbuf_cache;
 #line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp54_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection));
+					_tmp54_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp55_ = _tmp54_;
 #line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (!(_tmp55_ > PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT)) {
 #line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 						break;
-#line 24498 "Photo.c"
+#line 24577 "Photo.c"
 					}
 #line 3308 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp56_ = photo_source_pixbuf_cache;
@@ -24506,14 +24585,14 @@ 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 24508 "Photo.c"
+#line 24587 "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 24515 "Photo.c"
+#line 24594 "Photo.c"
 				guint _tmp60_ = 0U;
 #line 3313 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp60_ = photo_discard_source_id;
@@ -24521,17 +24600,17 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 				g_source_remove (_tmp60_);
 #line 3314 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_discard_source_id = (guint) 0;
-#line 24523 "Photo.c"
+#line 24602 "Photo.c"
 			}
 #line 3318 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp61_ = photo_source_pixbuf_cache;
 #line 3318 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp62_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp62_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 3318 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp63_ = _tmp62_;
 #line 3318 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp63_ > PHOTO_SOURCE_PIXBUF_MIN_LRU_COUNT) {
-#line 24533 "Photo.c"
+#line 24612 "Photo.c"
 				gdouble _tmp64_ = 0.0;
 				guint retry_sec = 0U;
 				gdouble _tmp65_ = 0.0;
@@ -24554,13 +24633,13 @@ 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 24556 "Photo.c"
+#line 24635 "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 24562 "Photo.c"
+#line 24641 "Photo.c"
 				PhotoCachedPixbuf* _tmp71_ = NULL;
 				GdkPixbuf* _tmp72_ = NULL;
 #line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24569,11 +24648,11 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 				_tmp72_ = _tmp71_->pixbuf;
 #line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp69_ = _tmp72_;
-#line 24571 "Photo.c"
+#line 24650 "Photo.c"
 			} else {
 #line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp69_ = NULL;
-#line 24575 "Photo.c"
+#line 24654 "Photo.c"
 			}
 #line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = _g_object_ref0 (_tmp69_);
@@ -24583,18 +24662,18 @@ 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 24585 "Photo.c"
+#line 24664 "Photo.c"
 			{
 				GeeLinkedList* _tmp74_ = NULL;
 #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 24592 "Photo.c"
+#line 24671 "Photo.c"
 			}
 #line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 24596 "Photo.c"
+#line 24675 "Photo.c"
 		}
 		__finally381:
 		{
@@ -24603,13 +24682,13 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 			_tmp75_ = photo_source_pixbuf_cache;
 #line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache);
-#line 24605 "Photo.c"
+#line 24684 "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 24611 "Photo.c"
+#line 24690 "Photo.c"
 	}
 }
 
@@ -24628,7 +24707,7 @@ 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 24630 "Photo.c"
+#line 24709 "Photo.c"
 			goto __catch382_g_error;
 		}
 	}
@@ -24642,24 +24721,26 @@ 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 24644 "Photo.c"
+#line 24723 "Photo.c"
 	}
 	__finally382:
 #line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 24728 "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);
 #line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
 #line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 24655 "Photo.c"
+		return _tmp2_;
+#line 24736 "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 24661 "Photo.c"
+#line 24742 "Photo.c"
 }
 
 
@@ -24689,7 +24770,7 @@ 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 24691 "Photo.c"
+#line 24772 "Photo.c"
 	}
 #line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp0_;
@@ -24709,7 +24790,7 @@ GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) {
 	_g_object_unref0 (_tmp0_);
 #line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24711 "Photo.c"
+#line 24792 "Photo.c"
 }
 
 
@@ -24720,7 +24801,7 @@ 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 24722 "Photo.c"
+#line 24803 "Photo.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		GdkPixbuf* _tmp1_ = NULL;
@@ -24732,7 +24813,7 @@ 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 24734 "Photo.c"
+#line 24815 "Photo.c"
 			goto __catch383_g_error;
 		}
 	}
@@ -24746,7 +24827,7 @@ void photo_discard_prefetched (Photo* self) {
 		_inner_error_ = NULL;
 #line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 24748 "Photo.c"
+#line 24829 "Photo.c"
 	}
 	__finally383:
 #line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24757,7 +24838,7 @@ void photo_discard_prefetched (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 24759 "Photo.c"
+#line 24840 "Photo.c"
 	}
 }
 
@@ -24819,21 +24900,21 @@ 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 24821 "Photo.c"
+#line 24902 "Photo.c"
 		PhotoFileFormat _tmp5_ = 0;
 #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 24827 "Photo.c"
+#line 24908 "Photo.c"
 	} else {
 #line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = FALSE;
-#line 24831 "Photo.c"
+#line 24912 "Photo.c"
 	}
 #line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 24835 "Photo.c"
+#line 24916 "Photo.c"
 		gboolean _tmp6_ = FALSE;
 		gboolean _tmp7_ = FALSE;
 		BackingFetchMode _tmp8_ = 0;
@@ -24843,39 +24924,39 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 		if (_tmp8_ == BACKING_FETCH_MODE_BASELINE) {
 #line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = TRUE;
-#line 24845 "Photo.c"
+#line 24926 "Photo.c"
 		} else {
 			BackingFetchMode _tmp9_ = 0;
 #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 24852 "Photo.c"
+#line 24933 "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 24858 "Photo.c"
+#line 24939 "Photo.c"
 		} else {
 			BackingFetchMode _tmp10_ = 0;
 #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 24865 "Photo.c"
+#line 24946 "Photo.c"
 		}
 #line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp6_;
-#line 24869 "Photo.c"
+#line 24950 "Photo.c"
 	} else {
 #line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = FALSE;
-#line 24873 "Photo.c"
+#line 24954 "Photo.c"
 	}
 #line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 24877 "Photo.c"
+#line 24958 "Photo.c"
 		RawDeveloper _tmp11_ = 0;
 		gboolean _tmp12_ = FALSE;
 #line 3386 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24884,21 +24965,21 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 		_tmp12_ = photo_is_raw_developer_complete (self, _tmp11_);
 #line 3386 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = !_tmp12_;
-#line 24886 "Photo.c"
+#line 24967 "Photo.c"
 	} else {
 #line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = FALSE;
-#line 24890 "Photo.c"
+#line 24971 "Photo.c"
 	}
 #line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
-#line 24894 "Photo.c"
+#line 24975 "Photo.c"
 		RawDeveloper _tmp13_ = 0;
 #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 24900 "Photo.c"
+#line 24981 "Photo.c"
 	}
 #line 3392 "/home/jens/Source/shotwell/src/Photo.vala"
 	dimensions_init (&original, 0, 0);
@@ -24912,14 +24993,14 @@ 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 24914 "Photo.c"
+#line 24995 "Photo.c"
 	{
 		PhotoRow* _tmp14_ = NULL;
 #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 24921 "Photo.c"
+#line 25002 "Photo.c"
 		{
 			Dimensions _tmp15_ = {0};
 			PhotoException _tmp16_ = 0;
@@ -24987,7 +25068,7 @@ 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 24989 "Photo.c"
+#line 25070 "Photo.c"
 				PixelTransformer* _tmp30_ = NULL;
 #line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = photo_get_pixel_transformer (self);
@@ -24995,13 +25076,13 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 				_pixel_transformer_unref0 (transformer);
 #line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
 				transformer = _tmp30_;
-#line 24997 "Photo.c"
+#line 25078 "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 25003 "Photo.c"
+#line 25084 "Photo.c"
 		}
 		__finally384:
 		{
@@ -25010,7 +25091,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 			_tmp32_ = self->row;
 #line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 25012 "Photo.c"
+#line 25093 "Photo.c"
 		}
 #line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -25022,7 +25103,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 25024 "Photo.c"
+#line 25105 "Photo.c"
 		}
 	}
 #line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25039,7 +25120,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 25041 "Photo.c"
+#line 25122 "Photo.c"
 	}
 #line 3430 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = exceptions;
@@ -25047,14 +25128,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 25049 "Photo.c"
+#line 25130 "Photo.c"
 		EditingToolsRedeyeInstance* _tmp36_ = NULL;
 		gint _tmp36__length1 = 0;
 #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 25056 "Photo.c"
+#line 25137 "Photo.c"
 		{
 			EditingToolsRedeyeInstance* instance_collection = NULL;
 			gint instance_collection_length1 = 0;
@@ -25066,11 +25147,11 @@ 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 25068 "Photo.c"
+#line 25149 "Photo.c"
 				EditingToolsRedeyeInstance instance = {0};
 #line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
 				instance = instance_collection[instance_it];
-#line 25072 "Photo.c"
+#line 25153 "Photo.c"
 				{
 					GdkPixbuf* _tmp37_ = NULL;
 					EditingToolsRedeyeInstance _tmp38_ = {0};
@@ -25085,7 +25166,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 25087 "Photo.c"
+#line 25168 "Photo.c"
 				}
 			}
 		}
@@ -25096,13 +25177,13 @@ 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 25098 "Photo.c"
+#line 25179 "Photo.c"
 		gboolean _tmp42_ = FALSE;
 #line 3448 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = is_straightened;
 #line 3448 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp42_) {
-#line 25104 "Photo.c"
+#line 25185 "Photo.c"
 			GdkPixbuf* _tmp43_ = NULL;
 			gdouble _tmp44_ = 0.0;
 			GdkPixbuf* _tmp45_ = NULL;
@@ -25116,7 +25197,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 25118 "Photo.c"
+#line 25199 "Photo.c"
 		}
 	}
 #line 3458 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25125,13 +25206,13 @@ 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 25127 "Photo.c"
+#line 25208 "Photo.c"
 		gboolean _tmp48_ = FALSE;
 #line 3462 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = is_cropped;
 #line 3462 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp48_) {
-#line 25133 "Photo.c"
+#line 25214 "Photo.c"
 			Box _tmp49_ = {0};
 			gint _tmp50_ = 0;
 			GdkPixbuf* _tmp51_ = NULL;
@@ -25252,7 +25333,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 25254 "Photo.c"
+#line 25335 "Photo.c"
 		}
 	}
 #line 3483 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25261,7 +25342,7 @@ 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 25263 "Photo.c"
+#line 25344 "Photo.c"
 		GdkPixbuf* _tmp87_ = NULL;
 		GdkPixbuf* _tmp88_ = NULL;
 #line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25272,13 +25353,13 @@ 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 25274 "Photo.c"
+#line 25355 "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 25280 "Photo.c"
+#line 25361 "Photo.c"
 		GdkPixbuf* _tmp90_ = NULL;
 		Dimensions _tmp91_ = {0};
 		gint _tmp92_ = 0;
@@ -25301,7 +25382,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 25303 "Photo.c"
+#line 25384 "Photo.c"
 	}
 #line 3506 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp96_ = exceptions;
@@ -25309,13 +25390,13 @@ 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 25311 "Photo.c"
+#line 25392 "Photo.c"
 		PixelTransformer* _tmp98_ = NULL;
 #line 3510 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp98_ = transformer;
 #line 3510 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp98_ != NULL) {
-#line 25317 "Photo.c"
+#line 25398 "Photo.c"
 			PixelTransformer* _tmp99_ = NULL;
 			GdkPixbuf* _tmp100_ = NULL;
 #line 3511 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25324,28 +25405,28 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 			_tmp100_ = pixbuf;
 #line 3511 "/home/jens/Source/shotwell/src/Photo.vala"
 			pixel_transformer_transform_pixbuf (_tmp99_, _tmp100_, NULL);
-#line 25326 "Photo.c"
+#line 25407 "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 25333 "Photo.c"
+#line 25414 "Photo.c"
 		gboolean _tmp103_ = FALSE;
 #line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp103_ = is_straightened;
 #line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp101_ = !_tmp103_;
-#line 25339 "Photo.c"
+#line 25420 "Photo.c"
 	} else {
 #line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp101_ = FALSE;
-#line 25343 "Photo.c"
+#line 25424 "Photo.c"
 	}
 #line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp101_) {
-#line 25347 "Photo.c"
+#line 25428 "Photo.c"
 		GdkPixbuf* _tmp104_ = NULL;
 		Dimensions _tmp105_ = {0};
 		gboolean _tmp106_ = FALSE;
@@ -25357,7 +25438,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 25359 "Photo.c"
+#line 25440 "Photo.c"
 	}
 #line 3529 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = pixbuf;
@@ -25367,16 +25448,17 @@ 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 25369 "Photo.c"
+#line 25450 "Photo.c"
 }
 
 
 static gboolean photo_real_has_user_generated_metadata (Photo* self) {
+	gboolean _tmp0_ = FALSE;
 #line 3537 "/home/jens/Source/shotwell/src/Photo.vala"
 	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 FALSE;
-#line 25378 "Photo.c"
+	return _tmp0_;
+#line 25460 "Photo.c"
 }
 
 
@@ -25385,7 +25467,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 25387 "Photo.c"
+#line 25469 "Photo.c"
 }
 
 
@@ -25394,7 +25476,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 25396 "Photo.c"
+#line 25478 "Photo.c"
 }
 
 
@@ -25403,7 +25485,7 @@ 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 25405 "Photo.c"
+#line 25487 "Photo.c"
 }
 
 
@@ -25416,7 +25498,7 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 	_tmp0_ = file_format;
 #line 3549 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 25418 "Photo.c"
+#line 25500 "Photo.c"
 		PhotoFileFormat* _tmp1_ = NULL;
 		PhotoFileFormatProperties* _tmp2_ = NULL;
 		PhotoFileFormatProperties* _tmp3_ = NULL;
@@ -25454,7 +25536,7 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 		result = _tmp9_;
 #line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 25456 "Photo.c"
+#line 25538 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp10_ = 0;
 		gboolean _tmp11_ = FALSE;
@@ -25464,7 +25546,7 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 		_tmp11_ = photo_file_format_can_write (_tmp10_);
 #line 3552 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp11_) {
-#line 25466 "Photo.c"
+#line 25548 "Photo.c"
 			PhotoFileFormat _tmp12_ = 0;
 			PhotoFileFormatProperties* _tmp13_ = NULL;
 			PhotoFileFormatProperties* _tmp14_ = NULL;
@@ -25502,7 +25584,7 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 			result = _tmp20_;
 #line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 25504 "Photo.c"
+#line 25586 "Photo.c"
 		} else {
 			PhotoFileFormat _tmp21_ = 0;
 			PhotoFileFormatProperties* _tmp22_ = NULL;
@@ -25541,7 +25623,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 25543 "Photo.c"
+#line 25625 "Photo.c"
 		}
 	}
 }
@@ -25551,49 +25633,49 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 	gboolean result = FALSE;
 	PhotoFileReader* export_reader = NULL;
 	gboolean is_master = FALSE;
-	PhotoFileReader* _tmp29_ = NULL;
-	PhotoFileFormatProperties* format_properties = NULL;
 	PhotoFileReader* _tmp30_ = NULL;
-	PhotoFileFormat _tmp31_ = 0;
-	PhotoFileFormatProperties* _tmp32_ = NULL;
-	GFile* dest_file = NULL;
+	PhotoFileFormatProperties* format_properties = NULL;
+	PhotoFileReader* _tmp31_ = NULL;
+	PhotoFileFormat _tmp32_ = 0;
 	PhotoFileFormatProperties* _tmp33_ = NULL;
-	GFile* _tmp34_ = NULL;
+	GFile* dest_file = NULL;
+	PhotoFileFormatProperties* _tmp34_ = NULL;
 	GFile* _tmp35_ = NULL;
+	GFile* _tmp36_ = NULL;
 	PhotoFileMetadataWriter* writer = NULL;
-	PhotoFileReader* _tmp36_ = NULL;
-	PhotoFileFormat _tmp37_ = 0;
-	GFile* _tmp38_ = NULL;
-	gchar* _tmp39_ = NULL;
+	PhotoFileReader* _tmp37_ = NULL;
+	PhotoFileFormat _tmp38_ = 0;
+	GFile* _tmp39_ = NULL;
 	gchar* _tmp40_ = NULL;
-	PhotoFileMetadataWriter* _tmp41_ = NULL;
+	gchar* _tmp41_ = NULL;
 	PhotoFileMetadataWriter* _tmp42_ = NULL;
-	gchar* _tmp43_ = NULL;
-	gchar* _tmp44_ = NULL;
-	PhotoFileMetadataWriter* _tmp45_ = NULL;
+	PhotoFileMetadataWriter* _tmp43_ = NULL;
+	gchar* _tmp45_ = NULL;
 	gchar* _tmp46_ = NULL;
-	gchar* _tmp47_ = NULL;
-	PhotoFileReader* _tmp48_ = NULL;
-	GFile* _tmp49_ = NULL;
-	GFile* _tmp50_ = NULL;
+	PhotoFileMetadataWriter* _tmp47_ = NULL;
+	gchar* _tmp48_ = NULL;
+	gchar* _tmp49_ = NULL;
+	PhotoFileReader* _tmp50_ = NULL;
 	GFile* _tmp51_ = NULL;
-	gboolean _tmp52_ = FALSE;
-	gboolean _tmp53_ = FALSE;
-	gboolean _tmp54_ = FALSE;
+	GFile* _tmp52_ = NULL;
+	GFile* _tmp53_ = NULL;
 	gboolean _tmp55_ = FALSE;
 	gboolean _tmp56_ = FALSE;
 	gboolean _tmp57_ = FALSE;
+	gboolean _tmp58_ = FALSE;
+	gboolean _tmp59_ = FALSE;
+	gboolean _tmp60_ = FALSE;
 	PhotoMetadata* metadata = NULL;
-	PhotoFileReader* _tmp65_ = NULL;
-	PhotoMetadata* _tmp66_ = NULL;
-	PhotoMetadata* _tmp67_ = NULL;
-	PhotoFileMetadataWriter* _tmp71_ = NULL;
-	gchar* _tmp72_ = NULL;
-	gchar* _tmp73_ = NULL;
-	time_t _tmp74_ = 0;
-	gboolean _tmp80_ = FALSE;
-	PhotoFileMetadataWriter* _tmp97_ = NULL;
-	PhotoMetadata* _tmp98_ = 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;
 	GError * _inner_error_ = NULL;
 #line 3562 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
@@ -25603,14 +25685,14 @@ 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 25605 "Photo.c"
+#line 25687 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #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 25612 "Photo.c"
+#line 25694 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			PhotoBackingReaders* _tmp2_ = NULL;
@@ -25621,7 +25703,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 			_tmp3_ = _tmp2_->editable;
 #line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ != NULL) {
-#line 25623 "Photo.c"
+#line 25705 "Photo.c"
 				PhotoBackingReaders* _tmp4_ = NULL;
 				PhotoFileReader* _tmp5_ = NULL;
 				PhotoFileFormat _tmp6_ = 0;
@@ -25636,15 +25718,15 @@ 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 25638 "Photo.c"
+#line 25720 "Photo.c"
 			} else {
 #line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 25642 "Photo.c"
+#line 25724 "Photo.c"
 			}
 #line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp1_) {
-#line 25646 "Photo.c"
+#line 25728 "Photo.c"
 				PhotoBackingReaders* _tmp8_ = NULL;
 				PhotoFileReader* _tmp9_ = NULL;
 				PhotoFileReader* _tmp10_ = NULL;
@@ -25660,7 +25742,7 @@ 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 25662 "Photo.c"
+#line 25744 "Photo.c"
 			} else {
 				gboolean _tmp11_ = FALSE;
 				PhotoBackingReaders* _tmp12_ = NULL;
@@ -25671,7 +25753,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 				_tmp13_ = _tmp12_->developer;
 #line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp13_ != NULL) {
-#line 25673 "Photo.c"
+#line 25755 "Photo.c"
 					PhotoBackingReaders* _tmp14_ = NULL;
 					PhotoFileReader* _tmp15_ = NULL;
 					PhotoFileFormat _tmp16_ = 0;
@@ -25686,15 +25768,15 @@ 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 25688 "Photo.c"
+#line 25770 "Photo.c"
 				} else {
 #line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = FALSE;
-#line 25692 "Photo.c"
+#line 25774 "Photo.c"
 				}
 #line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp11_) {
-#line 25696 "Photo.c"
+#line 25778 "Photo.c"
 					PhotoBackingReaders* _tmp18_ = NULL;
 					PhotoFileReader* _tmp19_ = NULL;
 					PhotoFileReader* _tmp20_ = NULL;
@@ -25710,7 +25792,7 @@ 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 25712 "Photo.c"
+#line 25794 "Photo.c"
 				} else {
 					PhotoBackingReaders* _tmp21_ = NULL;
 					PhotoFileReader* _tmp22_ = NULL;
@@ -25726,7 +25808,7 @@ 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 25728 "Photo.c"
+#line 25810 "Photo.c"
 						PhotoBackingReaders* _tmp25_ = NULL;
 						PhotoFileReader* _tmp26_ = NULL;
 						PhotoFileReader* _tmp27_ = NULL;
@@ -25740,7 +25822,7 @@ 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 25742 "Photo.c"
+#line 25824 "Photo.c"
 					}
 				}
 			}
@@ -25752,67 +25834,71 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 			_tmp28_ = self->priv->readers;
 #line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 25754 "Photo.c"
+#line 25836 "Photo.c"
 		}
 #line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 25840 "Photo.c"
+			gboolean _tmp29_ = FALSE;
 #line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
 #line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (export_reader);
 #line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
-			return FALSE;
-#line 25764 "Photo.c"
+			return _tmp29_;
+#line 25848 "Photo.c"
 		}
 	}
 #line 3579 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp29_ = export_reader;
+	_tmp30_ = export_reader;
 #line 3579 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp29_ == NULL) {
+	if (_tmp30_ == NULL) {
 #line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
 #line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
 #line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 25777 "Photo.c"
+#line 25861 "Photo.c"
 	}
 #line 3582 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp30_ = export_reader;
+	_tmp31_ = export_reader;
 #line 3582 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp31_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
+	_tmp32_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 3582 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp32_ = photo_file_format_get_properties (_tmp31_);
+	_tmp33_ = photo_file_format_get_properties (_tmp32_);
 #line 3582 "/home/jens/Source/shotwell/src/Photo.vala"
-	format_properties = _tmp32_;
+	format_properties = _tmp33_;
 #line 3585 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp33_ = format_properties;
+	_tmp34_ = format_properties;
 #line 3585 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp34_ = file;
+	_tmp35_ = file;
 #line 3585 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp35_ = photo_file_format_properties_convert_file_extension (_tmp33_, _tmp34_);
+	_tmp36_ = photo_file_format_properties_convert_file_extension (_tmp34_, _tmp35_);
 #line 3585 "/home/jens/Source/shotwell/src/Photo.vala"
-	dest_file = _tmp35_;
+	dest_file = _tmp36_;
 #line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp36_ = export_reader;
+	_tmp37_ = export_reader;
 #line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp37_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
+	_tmp38_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp38_ = dest_file;
+	_tmp39_ = dest_file;
 #line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp39_ = g_file_get_path (_tmp38_);
+	_tmp40_ = g_file_get_path (_tmp39_);
 #line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp40_ = _tmp39_;
+	_tmp41_ = _tmp40_;
 #line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp41_ = photo_file_format_create_metadata_writer (_tmp37_, _tmp40_, &_inner_error_);
+	_tmp42_ = photo_file_format_create_metadata_writer (_tmp38_, _tmp41_, &_inner_error_);
 #line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp42_ = _tmp41_;
+	_tmp43_ = _tmp42_;
 #line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_free0 (_tmp40_);
+	_g_free0 (_tmp41_);
 #line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
-	writer = _tmp42_;
+	writer = _tmp43_;
 #line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 25899 "Photo.c"
+		gboolean _tmp44_ = FALSE;
 #line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
 #line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25822,39 +25908,41 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 #line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
 #line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 25825 "Photo.c"
+		return _tmp44_;
+#line 25911 "Photo.c"
 	}
 #line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp43_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
+	_tmp45_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
 #line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp44_ = _tmp43_;
+	_tmp46_ = _tmp45_;
 #line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp45_ = writer;
+	_tmp47_ = writer;
 #line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp46_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
+	_tmp48_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp47_ = _tmp46_;
+	_tmp49_ = _tmp48_;
 #line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:3591: Exporting full-sized copy of %s to %s", _tmp44_, _tmp47_);
+	g_debug ("Photo.vala:3591: Exporting full-sized copy of %s to %s", _tmp46_, _tmp49_);
 #line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_free0 (_tmp47_);
+	_g_free0 (_tmp49_);
 #line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_free0 (_tmp44_);
+	_g_free0 (_tmp46_);
 #line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp48_ = export_reader;
+	_tmp50_ = export_reader;
 #line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp49_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
+	_tmp51_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp50_ = _tmp49_;
+	_tmp52_ = _tmp51_;
 #line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp51_ = dest_file;
+	_tmp53_ = dest_file;
 #line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_file_copy (_tmp50_, _tmp51_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_);
+	g_file_copy (_tmp52_, _tmp53_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_);
 #line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_object_unref0 (_tmp50_);
+	_g_object_unref0 (_tmp52_);
 #line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 25943 "Photo.c"
+		gboolean _tmp54_ = FALSE;
 #line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
 #line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25866,93 +25954,93 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 #line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
 #line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 25869 "Photo.c"
+		return _tmp54_;
+#line 25957 "Photo.c"
 	}
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp57_ = photo_has_alterations (self);
+	_tmp60_ = photo_has_alterations (self);
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (!_tmp57_) {
-#line 25875 "Photo.c"
-		gboolean _tmp58_ = FALSE;
+	if (!_tmp60_) {
+#line 25963 "Photo.c"
+		gboolean _tmp61_ = FALSE;
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp58_ = is_master;
+		_tmp61_ = is_master;
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp56_ = _tmp58_;
-#line 25881 "Photo.c"
+		_tmp59_ = _tmp61_;
+#line 25969 "Photo.c"
 	} else {
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp56_ = FALSE;
-#line 25885 "Photo.c"
+		_tmp59_ = FALSE;
+#line 25973 "Photo.c"
 	}
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp56_) {
-#line 25889 "Photo.c"
-		gboolean _tmp59_ = FALSE;
+	if (_tmp59_) {
+#line 25977 "Photo.c"
+		gboolean _tmp62_ = FALSE;
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp59_ = photo_has_user_generated_metadata (self);
+		_tmp62_ = photo_has_user_generated_metadata (self);
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp55_ = !_tmp59_;
-#line 25895 "Photo.c"
+		_tmp58_ = !_tmp62_;
+#line 25983 "Photo.c"
 	} else {
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp55_ = FALSE;
-#line 25899 "Photo.c"
+		_tmp58_ = FALSE;
+#line 25987 "Photo.c"
 	}
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp55_) {
-#line 25903 "Photo.c"
-		gchar* _tmp60_ = NULL;
-		gchar* _tmp61_ = NULL;
+	if (_tmp58_) {
+#line 25991 "Photo.c"
+		gchar* _tmp63_ = NULL;
+		gchar* _tmp64_ = NULL;
 #line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp60_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
+		_tmp63_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp61_ = _tmp60_;
+		_tmp64_ = _tmp63_;
 #line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp54_ = _tmp61_ == NULL;
+		_tmp57_ = _tmp64_ == NULL;
 #line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp61_);
-#line 25914 "Photo.c"
+		_g_free0 (_tmp64_);
+#line 26002 "Photo.c"
 	} else {
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp54_ = FALSE;
-#line 25918 "Photo.c"
+		_tmp57_ = FALSE;
+#line 26006 "Photo.c"
 	}
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp54_) {
-#line 25922 "Photo.c"
-		gchar* _tmp62_ = NULL;
-		gchar* _tmp63_ = NULL;
+	if (_tmp57_) {
+#line 26010 "Photo.c"
+		gchar* _tmp65_ = NULL;
+		gchar* _tmp66_ = NULL;
 #line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp62_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
+		_tmp65_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp63_ = _tmp62_;
+		_tmp66_ = _tmp65_;
 #line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp53_ = _tmp63_ == NULL;
+		_tmp56_ = _tmp66_ == NULL;
 #line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp63_);
-#line 25933 "Photo.c"
+		_g_free0 (_tmp66_);
+#line 26021 "Photo.c"
 	} else {
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp53_ = FALSE;
-#line 25937 "Photo.c"
+		_tmp56_ = FALSE;
+#line 26025 "Photo.c"
 	}
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp53_) {
-#line 25941 "Photo.c"
-		gboolean _tmp64_ = FALSE;
+	if (_tmp56_) {
+#line 26029 "Photo.c"
+		gboolean _tmp67_ = FALSE;
 #line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp64_ = export_metadata;
+		_tmp67_ = export_metadata;
 #line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp52_ = _tmp64_;
-#line 25947 "Photo.c"
+		_tmp55_ = _tmp67_;
+#line 26035 "Photo.c"
 	} else {
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp52_ = FALSE;
-#line 25951 "Photo.c"
+		_tmp55_ = FALSE;
+#line 26039 "Photo.c"
 	}
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp52_) {
+	if (_tmp55_) {
 #line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = TRUE;
 #line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25965,16 +26053,18 @@ 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 25967 "Photo.c"
+#line 26055 "Photo.c"
 	}
 #line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp65_ = export_reader;
+	_tmp68_ = export_reader;
 #line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp66_ = photo_file_reader_read_metadata (_tmp65_, &_inner_error_);
+	_tmp69_ = photo_file_reader_read_metadata (_tmp68_, &_inner_error_);
 #line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
-	metadata = _tmp66_;
+	metadata = _tmp69_;
 #line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 26065 "Photo.c"
+		gboolean _tmp70_ = FALSE;
 #line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
 #line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25986,159 +26076,161 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 #line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
 #line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 25989 "Photo.c"
+		return _tmp70_;
+#line 26079 "Photo.c"
 	}
 #line 3604 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp67_ = metadata;
+	_tmp71_ = metadata;
 #line 3604 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp67_ == NULL) {
-#line 25995 "Photo.c"
-		PhotoFileReader* _tmp68_ = NULL;
-		PhotoFileFormat _tmp69_ = 0;
-		PhotoMetadata* _tmp70_ = NULL;
+	if (_tmp71_ == NULL) {
+#line 26085 "Photo.c"
+		PhotoFileReader* _tmp72_ = NULL;
+		PhotoFileFormat _tmp73_ = 0;
+		PhotoMetadata* _tmp74_ = NULL;
 #line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp68_ = export_reader;
+		_tmp72_ = export_reader;
 #line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp69_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
+		_tmp73_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp70_ = photo_file_format_create_metadata (_tmp69_);
+		_tmp74_ = photo_file_format_create_metadata (_tmp73_);
 #line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
 #line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
-		metadata = _tmp70_;
-#line 26009 "Photo.c"
+		metadata = _tmp74_;
+#line 26099 "Photo.c"
 	}
 #line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp71_ = writer;
+	_tmp75_ = writer;
 #line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp72_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
+	_tmp76_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp73_ = _tmp72_;
+	_tmp77_ = _tmp76_;
 #line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:3607: Updating metadata of %s", _tmp73_);
+	g_debug ("Photo.vala:3607: Updating metadata of %s", _tmp77_);
 #line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_free0 (_tmp73_);
+	_g_free0 (_tmp77_);
 #line 3609 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp74_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
+	_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 (_tmp74_ != ((time_t) 0)) {
-#line 26025 "Photo.c"
-		PhotoMetadata* _tmp75_ = NULL;
-		time_t _tmp76_ = 0;
-		MetadataDateTime* _tmp77_ = NULL;
-		MetadataDateTime* _tmp78_ = NULL;
+	if (_tmp78_ != ((time_t) 0)) {
+#line 26115 "Photo.c"
+		PhotoMetadata* _tmp79_ = NULL;
+		time_t _tmp80_ = 0;
+		MetadataDateTime* _tmp81_ = NULL;
+		MetadataDateTime* _tmp82_ = NULL;
 #line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp75_ = metadata;
+		_tmp79_ = metadata;
 #line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp76_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
+		_tmp80_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp77_ = metadata_date_time_new (_tmp76_);
+		_tmp81_ = metadata_date_time_new (_tmp80_);
 #line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp78_ = _tmp77_;
+		_tmp82_ = _tmp81_;
 #line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_metadata_set_exposure_date_time (_tmp75_, _tmp78_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
+		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 (_tmp78_);
-#line 26042 "Photo.c"
+		_metadata_date_time_unref0 (_tmp82_);
+#line 26132 "Photo.c"
 	} else {
-		PhotoMetadata* _tmp79_ = NULL;
+		PhotoMetadata* _tmp83_ = NULL;
 #line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp79_ = metadata;
+		_tmp83_ = metadata;
 #line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_metadata_set_exposure_date_time (_tmp79_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 26049 "Photo.c"
+		photo_metadata_set_exposure_date_time (_tmp83_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
+#line 26139 "Photo.c"
 	}
 #line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp80_ = export_metadata;
+	_tmp84_ = export_metadata;
 #line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp80_) {
-#line 26055 "Photo.c"
-		PhotoMetadata* _tmp81_ = NULL;
-		gchar* _tmp82_ = NULL;
-		gchar* _tmp83_ = NULL;
-		PhotoMetadata* _tmp84_ = NULL;
-		gchar* _tmp85_ = NULL;
+	if (_tmp84_) {
+#line 26145 "Photo.c"
+		PhotoMetadata* _tmp85_ = NULL;
 		gchar* _tmp86_ = NULL;
-		PhotoMetadata* _tmp87_ = NULL;
-		Dimensions _tmp88_ = {0};
-		PhotoMetadata* _tmp89_ = NULL;
-		Orientation _tmp90_ = 0;
+		gchar* _tmp87_ = NULL;
+		PhotoMetadata* _tmp88_ = NULL;
+		gchar* _tmp89_ = NULL;
+		gchar* _tmp90_ = NULL;
 		PhotoMetadata* _tmp91_ = NULL;
-		Orientation _tmp92_ = 0;
-		Orientation _tmp93_ = 0;
+		Dimensions _tmp92_ = {0};
+		PhotoMetadata* _tmp93_ = NULL;
+		Orientation _tmp94_ = 0;
 		PhotoMetadata* _tmp95_ = NULL;
+		Orientation _tmp96_ = 0;
+		Orientation _tmp97_ = 0;
+		PhotoMetadata* _tmp99_ = NULL;
 #line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp81_ = metadata;
+		_tmp85_ = metadata;
 #line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp82_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
+		_tmp86_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp83_ = _tmp82_;
+		_tmp87_ = _tmp86_;
 #line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_metadata_set_title (_tmp81_, _tmp83_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
+		photo_metadata_set_title (_tmp85_, _tmp87_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp83_);
+		_g_free0 (_tmp87_);
 #line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp84_ = metadata;
+		_tmp88_ = metadata;
 #line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp85_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
+		_tmp89_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp86_ = _tmp85_;
+		_tmp90_ = _tmp89_;
 #line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_metadata_set_comment (_tmp84_, _tmp86_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
+		photo_metadata_set_comment (_tmp88_, _tmp90_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp86_);
+		_g_free0 (_tmp90_);
 #line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp87_ = metadata;
+		_tmp91_ = metadata;
 #line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
-		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp88_);
+		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp92_);
 #line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_metadata_set_pixel_dimensions (_tmp87_, &_tmp88_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
+		photo_metadata_set_pixel_dimensions (_tmp91_, &_tmp92_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 3619 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp89_ = metadata;
+		_tmp93_ = metadata;
 #line 3619 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp90_ = photo_get_orientation (self);
+		_tmp94_ = photo_get_orientation (self);
 #line 3619 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_metadata_set_orientation (_tmp89_, _tmp90_);
+		photo_metadata_set_orientation (_tmp93_, _tmp94_);
 #line 3620 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp91_ = metadata;
+		_tmp95_ = metadata;
 #line 3620 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_metadata_set_software (_tmp91_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION);
+		photo_metadata_set_software (_tmp95_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION);
 #line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp92_ = photo_get_orientation (self);
+		_tmp96_ = photo_get_orientation (self);
 #line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp93_ = photo_get_original_orientation (self);
+		_tmp97_ = photo_get_original_orientation (self);
 #line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
-		if (_tmp92_ != _tmp93_) {
-#line 26112 "Photo.c"
-			PhotoMetadata* _tmp94_ = NULL;
+		if (_tmp96_ != _tmp97_) {
+#line 26202 "Photo.c"
+			PhotoMetadata* _tmp98_ = NULL;
 #line 3623 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp94_ = metadata;
+			_tmp98_ = metadata;
 #line 3623 "/home/jens/Source/shotwell/src/Photo.vala"
-			photo_metadata_remove_exif_thumbnail (_tmp94_);
-#line 26118 "Photo.c"
+			photo_metadata_remove_exif_thumbnail (_tmp98_);
+#line 26208 "Photo.c"
 		}
 #line 3625 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp95_ = metadata;
+		_tmp99_ = metadata;
 #line 3625 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_set_user_metadata_for_export (self, _tmp95_);
-#line 26124 "Photo.c"
+		photo_set_user_metadata_for_export (self, _tmp99_);
+#line 26214 "Photo.c"
 	} else {
-		PhotoMetadata* _tmp96_ = NULL;
+		PhotoMetadata* _tmp100_ = NULL;
 #line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp96_ = metadata;
+		_tmp100_ = metadata;
 #line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_metadata_clear (_tmp96_);
-#line 26131 "Photo.c"
+		photo_metadata_clear (_tmp100_);
+#line 26221 "Photo.c"
 	}
 #line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp97_ = writer;
+	_tmp101_ = writer;
 #line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp98_ = metadata;
+	_tmp102_ = metadata;
 #line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_file_metadata_writer_write_metadata (_tmp97_, _tmp98_, &_inner_error_);
+	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"
+		gboolean _tmp103_ = FALSE;
 #line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
 #line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26152,8 +26244,8 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 #line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
 #line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 26155 "Photo.c"
+		return _tmp103_;
+#line 26247 "Photo.c"
 	}
 #line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
@@ -26169,7 +26261,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 26171 "Photo.c"
+#line 26263 "Photo.c"
 }
 
 
@@ -26189,33 +26281,33 @@ gboolean photo_is_export_required (Photo* self, Scaling* scaling, PhotoFileForma
 	if (!_tmp3_) {
 #line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = TRUE;
-#line 26191 "Photo.c"
+#line 26283 "Photo.c"
 	} else {
 		gboolean _tmp4_ = FALSE;
 #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 26198 "Photo.c"
+#line 26290 "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 26204 "Photo.c"
+#line 26296 "Photo.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 #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 26211 "Photo.c"
+#line 26303 "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 26217 "Photo.c"
+#line 26309 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp6_ = 0;
 		PhotoFileFormat _tmp7_ = 0;
@@ -26225,13 +26317,13 @@ gboolean photo_is_export_required (Photo* self, Scaling* scaling, PhotoFileForma
 		_tmp7_ = photo_get_file_format (self);
 #line 3641 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp6_ != _tmp7_;
-#line 26227 "Photo.c"
+#line 26319 "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 26233 "Photo.c"
+#line 26325 "Photo.c"
 }
 
 
@@ -26293,7 +26385,7 @@ 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 26295 "Photo.c"
+#line 26387 "Photo.c"
 		GFile* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
@@ -26313,17 +26405,17 @@ 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 26315 "Photo.c"
+#line 26407 "Photo.c"
 		}
 #line 3652 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26319 "Photo.c"
+#line 26411 "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 26325 "Photo.c"
+#line 26417 "Photo.c"
 		gboolean _tmp8_ = FALSE;
 		gboolean _tmp9_ = FALSE;
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26332,26 +26424,26 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		if (!_tmp9_) {
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = TRUE;
-#line 26334 "Photo.c"
+#line 26426 "Photo.c"
 		} else {
 			gboolean _tmp10_ = FALSE;
 #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 26341 "Photo.c"
+#line 26433 "Photo.c"
 		}
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp8_;
-#line 26345 "Photo.c"
+#line 26437 "Photo.c"
 	} else {
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = FALSE;
-#line 26349 "Photo.c"
+#line 26441 "Photo.c"
 	}
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 26353 "Photo.c"
+#line 26445 "Photo.c"
 		PhotoFileFormat _tmp11_ = 0;
 		PhotoFileFormat _tmp12_ = 0;
 #line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26360,29 +26452,29 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_tmp12_ = photo_get_file_format (self);
 #line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp11_ == _tmp12_;
-#line 26362 "Photo.c"
+#line 26454 "Photo.c"
 	} else {
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = FALSE;
-#line 26366 "Photo.c"
+#line 26458 "Photo.c"
 	}
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 26370 "Photo.c"
+#line 26462 "Photo.c"
 		PhotoFileFormat _tmp13_ = 0;
 #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 26376 "Photo.c"
+#line 26468 "Photo.c"
 	} else {
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = FALSE;
-#line 26380 "Photo.c"
+#line 26472 "Photo.c"
 	}
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp4_) {
-#line 26384 "Photo.c"
+#line 26476 "Photo.c"
 		gboolean _tmp14_ = FALSE;
 		GFile* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
@@ -26401,13 +26493,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 26403 "Photo.c"
+#line 26495 "Photo.c"
 		}
 #line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp14_) {
 #line 3662 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26409 "Photo.c"
+#line 26501 "Photo.c"
 		}
 	}
 #line 3668 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26418,7 +26510,7 @@ 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 26420 "Photo.c"
+#line 26512 "Photo.c"
 		PhotoFileFormat _tmp20_ = 0;
 		PhotoMetadata* _tmp21_ = NULL;
 #line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26429,7 +26521,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 26431 "Photo.c"
+#line 26523 "Photo.c"
 	}
 #line 3672 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = export_format;
@@ -26437,13 +26529,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 26439 "Photo.c"
+#line 26531 "Photo.c"
 		PhotoFileFormat _tmp24_ = 0;
 #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 26445 "Photo.c"
+#line 26537 "Photo.c"
 	}
 #line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = export_format;
@@ -26469,7 +26561,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 26471 "Photo.c"
+#line 26563 "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));
@@ -26498,18 +26590,18 @@ 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 26499 "Photo.c"
+#line 26591 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp40_ = 0;
 #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 26506 "Photo.c"
+#line 26598 "Photo.c"
 	}
 #line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp38_) {
-#line 26510 "Photo.c"
+#line 26602 "Photo.c"
 		GdkPixbuf* _tmp41_ = NULL;
 		Scaling _tmp42_ = {0};
 		GdkPixbuf* _tmp43_ = NULL;
@@ -26532,7 +26624,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 26533 "Photo.c"
+#line 26625 "Photo.c"
 		}
 #line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp44_ = _tmp41_;
@@ -26544,7 +26636,7 @@ 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 26545 "Photo.c"
+#line 26637 "Photo.c"
 	} else {
 		GdkPixbuf* _tmp45_ = NULL;
 		Scaling _tmp46_ = {0};
@@ -26568,7 +26660,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 26569 "Photo.c"
+#line 26661 "Photo.c"
 		}
 #line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = _tmp45_;
@@ -26580,7 +26672,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 26581 "Photo.c"
+#line 26673 "Photo.c"
 	}
 #line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = writer;
@@ -26602,7 +26694,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 26603 "Photo.c"
+#line 26695 "Photo.c"
 	}
 #line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp52_ = writer;
@@ -26618,7 +26710,7 @@ 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 26619 "Photo.c"
+#line 26711 "Photo.c"
 		PhotoMetadata* _tmp56_ = NULL;
 		gchar* _tmp57_ = NULL;
 		gchar* _tmp58_ = NULL;
@@ -26659,7 +26751,7 @@ 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 26660 "Photo.c"
+#line 26752 "Photo.c"
 			PhotoMetadata* _tmp64_ = NULL;
 			time_t _tmp65_ = 0;
 			MetadataDateTime* _tmp66_ = NULL;
@@ -26676,14 +26768,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 26677 "Photo.c"
+#line 26769 "Photo.c"
 		} else {
 			PhotoMetadata* _tmp68_ = NULL;
 #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 26684 "Photo.c"
+#line 26776 "Photo.c"
 		}
 #line 3710 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp69_ = metadata;
@@ -26701,13 +26793,13 @@ 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 26702 "Photo.c"
+#line 26794 "Photo.c"
 			PhotoMetadata* _tmp73_ = NULL;
 #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 26708 "Photo.c"
+#line 26800 "Photo.c"
 		}
 	} else {
 		PhotoMetadata* _tmp74_ = NULL;
@@ -26715,7 +26807,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_tmp74_ = metadata;
 #line 3719 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_clear (_tmp74_);
-#line 26716 "Photo.c"
+#line 26808 "Photo.c"
 	}
 #line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp76_ = photo_get_file_format (self);
@@ -26723,18 +26815,18 @@ 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 26724 "Photo.c"
+#line 26816 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp77_ = 0;
 #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 26731 "Photo.c"
+#line 26823 "Photo.c"
 	}
 #line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp75_) {
-#line 26735 "Photo.c"
+#line 26827 "Photo.c"
 		PhotoMetadata* _tmp78_ = NULL;
 		Dimensions _tmp79_ = {0};
 		PhotoMetadata* _tmp80_ = NULL;
@@ -26751,7 +26843,7 @@ 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 26752 "Photo.c"
+#line 26844 "Photo.c"
 	} else {
 		PhotoMetadata* _tmp82_ = NULL;
 		GdkPixbuf* _tmp83_ = NULL;
@@ -26769,7 +26861,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 26770 "Photo.c"
+#line 26862 "Photo.c"
 	}
 #line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp87_ = export_format;
@@ -26799,7 +26891,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 26800 "Photo.c"
+#line 26892 "Photo.c"
 	}
 #line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp93_ = _tmp86_;
@@ -26827,7 +26919,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 26828 "Photo.c"
+#line 26920 "Photo.c"
 	}
 #line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp86_);
@@ -26837,7 +26929,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 26838 "Photo.c"
+#line 26930 "Photo.c"
 }
 
 
@@ -26871,14 +26963,14 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 	GError * _inner_error_ = NULL;
 #line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 26872 "Photo.c"
+#line 26964 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #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 26879 "Photo.c"
+#line 26971 "Photo.c"
 		{
 			PhotoFileFormat _tmp1_ = 0;
 			GFile* _tmp2_ = NULL;
@@ -26892,7 +26984,7 @@ 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 26893 "Photo.c"
+#line 26985 "Photo.c"
 		}
 		__finally386:
 		{
@@ -26901,7 +26993,7 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 			_tmp3_ = self->row;
 #line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 26902 "Photo.c"
+#line 26994 "Photo.c"
 		}
 #line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -26911,7 +27003,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 26912 "Photo.c"
+#line 27004 "Photo.c"
 		}
 	}
 #line 3746 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26920,13 +27012,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 26921 "Photo.c"
+#line 27013 "Photo.c"
 		PhotoFileFormat _tmp6_ = 0;
 #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 26927 "Photo.c"
+#line 27019 "Photo.c"
 	}
 #line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = g_file_get_basename (backing);
@@ -26950,7 +27042,7 @@ 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 26951 "Photo.c"
+#line 27043 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp13_ = 0;
 		PhotoFileFormatProperties* _tmp14_ = NULL;
@@ -26971,11 +27063,11 @@ 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 26972 "Photo.c"
+#line 27064 "Photo.c"
 	}
 #line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 26976 "Photo.c"
+#line 27068 "Photo.c"
 		PhotoFileFormat _tmp18_ = 0;
 		PhotoFileFormatProperties* _tmp19_ = NULL;
 		PhotoFileFormatProperties* _tmp20_ = NULL;
@@ -26994,7 +27086,7 @@ 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 26995 "Photo.c"
+#line 27087 "Photo.c"
 	}
 #line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = name;
@@ -27034,7 +27126,7 @@ 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 27035 "Photo.c"
+#line 27127 "Photo.c"
 	}
 #line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = _tmp26_;
@@ -27056,18 +27148,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 27057 "Photo.c"
+#line 27149 "Photo.c"
 	}
 #line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 27061 "Photo.c"
+#line 27153 "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 27068 "Photo.c"
+#line 27160 "Photo.c"
 }
 
 
@@ -27076,7 +27168,7 @@ 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 27077 "Photo.c"
+#line 27169 "Photo.c"
 }
 
 
@@ -27090,29 +27182,29 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 	gboolean _tmp10_ = FALSE;
 	GAppInfo* app = NULL;
 	GList* files = NULL;
-	GFile* _tmp15_ = NULL;
 	GFile* _tmp16_ = NULL;
-	GAppInfo* _tmp17_ = NULL;
+	GFile* _tmp17_ = NULL;
+	GAppInfo* _tmp18_ = NULL;
 	gchar** argv = NULL;
-	gchar** _tmp22_ = NULL;
+	gchar** _tmp24_ = NULL;
 	gint argv_length1 = 0;
 	gint _argv_size_ = 0;
-	gchar** _tmp23_ = NULL;
-	gint _tmp23__length1 = 0;
-	const gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	gchar** _tmp27_ = NULL;
-	gint _tmp27__length1 = 0;
-	GFile* _tmp28_ = NULL;
-	gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
+	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;
 	GPid child_pid = 0;
-	gboolean _tmp31_ = FALSE;
-	gchar** _tmp32_ = NULL;
-	gint _tmp32__length1 = 0;
-	GPid _tmp33_ = 0;
-	gboolean _tmp34_ = FALSE;
+	gboolean _tmp33_ = FALSE;
+	gchar** _tmp34_ = NULL;
+	gint _tmp34__length1 = 0;
+	GPid _tmp35_ = 0;
+	gboolean _tmp36_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 3761 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
@@ -27120,7 +27212,7 @@ 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 27121 "Photo.c"
+#line 27213 "Photo.c"
 		ConfigFacade* _tmp2_ = NULL;
 		ConfigFacade* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
@@ -27136,7 +27228,7 @@ 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 27137 "Photo.c"
+#line 27229 "Photo.c"
 	} else {
 		ConfigFacade* _tmp5_ = NULL;
 		ConfigFacade* _tmp6_ = NULL;
@@ -27153,7 +27245,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 27154 "Photo.c"
+#line 27246 "Photo.c"
 	}
 #line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = g_strdup (_tmp0_);
@@ -27173,7 +27265,7 @@ 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 27174 "Photo.c"
+#line 27266 "Photo.c"
 	}
 	{
 		GAppInfo* _tmp11_ = NULL;
@@ -27188,7 +27280,7 @@ 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 27189 "Photo.c"
+#line 27281 "Photo.c"
 			goto __catch387_g_error;
 		}
 #line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27201,7 +27293,7 @@ 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 27202 "Photo.c"
+#line 27294 "Photo.c"
 	}
 	goto __finally387;
 	__catch387_g_error:
@@ -27217,11 +27309,13 @@ 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 27218 "Photo.c"
+#line 27310 "Photo.c"
 	}
 	__finally387:
 #line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 27315 "Photo.c"
+		gboolean _tmp15_ = FALSE;
 #line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
 #line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27231,36 +27325,38 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 #line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
 #line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 27233 "Photo.c"
+		return _tmp15_;
+#line 27327 "Photo.c"
 	}
 #line 3776 "/home/jens/Source/shotwell/src/Photo.vala"
 	files = NULL;
 #line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp15_ = file;
+	_tmp16_ = file;
 #line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp16_ = _g_object_ref0 (_tmp15_);
+	_tmp17_ = _g_object_ref0 (_tmp16_);
 #line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
-	files = g_list_insert (files, _tmp16_, -1);
+	files = g_list_insert (files, _tmp17_, -1);
 #line 3779 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp17_ = app;
+	_tmp18_ = app;
 #line 3779 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp17_ != NULL) {
-#line 27247 "Photo.c"
-		gboolean _tmp18_ = FALSE;
-		GAppInfo* _tmp19_ = NULL;
-		GList* _tmp20_ = NULL;
-		gboolean _tmp21_ = FALSE;
+	if (_tmp18_ != NULL) {
+#line 27341 "Photo.c"
+		gboolean _tmp19_ = FALSE;
+		GAppInfo* _tmp20_ = NULL;
+		GList* _tmp21_ = NULL;
+		gboolean _tmp22_ = FALSE;
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp19_ = app;
+		_tmp20_ = app;
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp20_ = files;
+		_tmp21_ = files;
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp21_ = g_app_info_launch (_tmp19_, _tmp20_, NULL, &_inner_error_);
+		_tmp22_ = g_app_info_launch (_tmp20_, _tmp21_, NULL, &_inner_error_);
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp18_ = _tmp21_;
+		_tmp19_ = _tmp22_;
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 27356 "Photo.c"
+			gboolean _tmp23_ = FALSE;
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27272,11 +27368,11 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (_tmp0_);
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
-			return FALSE;
-#line 27274 "Photo.c"
+			return _tmp23_;
+#line 27370 "Photo.c"
 		}
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
-		result = _tmp18_;
+		result = _tmp19_;
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		__g_list_free__g_object_unref0_0 (files);
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27287,56 +27383,58 @@ 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 27288 "Photo.c"
+#line 27384 "Photo.c"
 	}
 #line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp22_ = g_new0 (gchar*, 2 + 1);
+	_tmp24_ = g_new0 (gchar*, 2 + 1);
 #line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
-	argv = _tmp22_;
+	argv = _tmp24_;
 #line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
 	argv_length1 = 2;
 #line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
 	_argv_size_ = argv_length1;
 #line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp23_ = argv;
+	_tmp25_ = argv;
 #line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp23__length1 = argv_length1;
+	_tmp25__length1 = argv_length1;
 #line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp24_ = commandline;
+	_tmp26_ = commandline;
 #line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp25_ = g_strdup (_tmp24_);
+	_tmp27_ = g_strdup (_tmp26_);
 #line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_free0 (_tmp23_[0]);
+	_g_free0 (_tmp25_[0]);
 #line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp23_[0] = _tmp25_;
+	_tmp25_[0] = _tmp27_;
 #line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp26_ = _tmp23_[0];
+	_tmp28_ = _tmp25_[0];
 #line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp27_ = argv;
+	_tmp29_ = argv;
 #line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp27__length1 = argv_length1;
+	_tmp29__length1 = argv_length1;
 #line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp28_ = file;
+	_tmp30_ = file;
 #line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp29_ = g_file_get_path (_tmp28_);
+	_tmp31_ = g_file_get_path (_tmp30_);
 #line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_free0 (_tmp27_[1]);
+	_g_free0 (_tmp29_[1]);
 #line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp27_[1] = _tmp29_;
+	_tmp29_[1] = _tmp31_;
 #line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp30_ = _tmp27_[1];
+	_tmp32_ = _tmp29_[1];
 #line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp32_ = argv;
+	_tmp34_ = argv;
 #line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp32__length1 = argv_length1;
+	_tmp34__length1 = argv_length1;
 #line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp34_ = g_spawn_async ("/", _tmp32_, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &_tmp33_, &_inner_error_);
+	_tmp36_ = g_spawn_async ("/", _tmp34_, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &_tmp35_, &_inner_error_);
 #line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
-	child_pid = _tmp33_;
+	child_pid = _tmp35_;
 #line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp31_ = _tmp34_;
+	_tmp33_ = _tmp36_;
 #line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 27434 "Photo.c"
+		gboolean _tmp37_ = FALSE;
 #line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
 #line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27350,11 +27448,11 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 #line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
 #line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
-		return FALSE;
-#line 27352 "Photo.c"
+		return _tmp37_;
+#line 27450 "Photo.c"
 	}
 #line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
-	result = _tmp31_;
+	result = _tmp33_;
 #line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
 #line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27367,7 +27465,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 result;
-#line 27368 "Photo.c"
+#line 27466 "Photo.c"
 }
 
 
@@ -27394,7 +27492,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 27395 "Photo.c"
+#line 27493 "Photo.c"
 	}
 }
 
@@ -27419,14 +27517,14 @@ 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 27420 "Photo.c"
+#line 27518 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #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 27427 "Photo.c"
+#line 27525 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -27437,7 +27535,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 			_tmp2_ = _tmp1_->editable;
 #line 3808 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 27438 "Photo.c"
+#line 27536 "Photo.c"
 				PhotoBackingReaders* _tmp3_ = NULL;
 				PhotoFileReader* _tmp4_ = NULL;
 				GFile* _tmp5_ = NULL;
@@ -27451,13 +27549,13 @@ 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 27452 "Photo.c"
+#line 27550 "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 27458 "Photo.c"
+#line 27556 "Photo.c"
 				GFile* _tmp7_ = NULL;
 				PhotoFileFormat _tmp8_ = 0;
 				GFile* _tmp9_ = NULL;
@@ -27470,7 +27568,7 @@ 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 27471 "Photo.c"
+#line 27569 "Photo.c"
 					goto __finally388;
 				}
 #line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27483,7 +27581,7 @@ 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 27484 "Photo.c"
+#line 27582 "Photo.c"
 			} else {
 				PhotoBackingReaders* _tmp11_ = NULL;
 				PhotoFileReader* _tmp12_ = NULL;
@@ -27496,7 +27594,7 @@ 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 27497 "Photo.c"
+#line 27595 "Photo.c"
 			}
 		}
 		__finally388:
@@ -27506,7 +27604,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 			_tmp14_ = self->priv->readers;
 #line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 27507 "Photo.c"
+#line 27605 "Photo.c"
 		}
 #line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -27518,28 +27616,28 @@ 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 27519 "Photo.c"
+#line 27617 "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 27526 "Photo.c"
+#line 27624 "Photo.c"
 		GFile* _tmp18_ = NULL;
 #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 27532 "Photo.c"
+#line 27630 "Photo.c"
 	} else {
 #line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = FALSE;
-#line 27536 "Photo.c"
+#line 27634 "Photo.c"
 	}
 #line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_) {
-#line 27540 "Photo.c"
+#line 27638 "Photo.c"
 		gboolean _tmp19_ = FALSE;
 		GFile* _tmp20_ = NULL;
 		gboolean _tmp21_ = FALSE;
@@ -27551,26 +27649,26 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 		if (!_tmp21_) {
 #line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = TRUE;
-#line 27552 "Photo.c"
+#line 27650 "Photo.c"
 		} else {
 			gboolean _tmp22_ = FALSE;
 #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 27559 "Photo.c"
+#line 27657 "Photo.c"
 		}
 #line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = _tmp19_;
-#line 27563 "Photo.c"
+#line 27661 "Photo.c"
 	} else {
 #line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = FALSE;
-#line 27567 "Photo.c"
+#line 27665 "Photo.c"
 	}
 #line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp15_) {
-#line 27571 "Photo.c"
+#line 27669 "Photo.c"
 		GFile* _tmp23_ = NULL;
 		GFile* _tmp24_ = NULL;
 #line 3821 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27581,13 +27679,13 @@ 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 27582 "Photo.c"
+#line 27680 "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 27588 "Photo.c"
+#line 27686 "Photo.c"
 		PhotoFileFormat _tmp27_ = 0;
 		gboolean _tmp28_ = FALSE;
 #line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27596,22 +27694,22 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 		_tmp28_ = photo_file_format_can_write (_tmp27_);
 #line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp28_;
-#line 27597 "Photo.c"
+#line 27695 "Photo.c"
 	} else {
 #line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = FALSE;
-#line 27601 "Photo.c"
+#line 27699 "Photo.c"
 	}
 #line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp25_) {
-#line 27605 "Photo.c"
+#line 27703 "Photo.c"
 		PhotoFileFormat _tmp40_ = 0;
 		GFile* _tmp41_ = NULL;
 		GFile* _tmp42_ = NULL;
 		GFile* _tmp43_ = NULL;
 #line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_halt_monitoring_editable (self);
-#line 27612 "Photo.c"
+#line 27710 "Photo.c"
 		{
 			GFile* _tmp29_ = NULL;
 			Scaling _tmp30_ = {0};
@@ -27626,7 +27724,7 @@ 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 27627 "Photo.c"
+#line 27725 "Photo.c"
 				goto __catch389_g_error;
 			}
 		}
@@ -27640,7 +27738,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 			err = _inner_error_;
 #line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = NULL;
-#line 27641 "Photo.c"
+#line 27739 "Photo.c"
 			{
 				GFile* _tmp32_ = NULL;
 #line 3833 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27649,7 +27747,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 				g_file_delete (_tmp32_, NULL, &_inner_error_);
 #line 3833 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27650 "Photo.c"
+#line 27748 "Photo.c"
 					goto __catch390_g_error;
 				}
 			}
@@ -27683,7 +27781,7 @@ 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 27683 "Photo.c"
+#line 27781 "Photo.c"
 			}
 			__finally390:
 #line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27702,7 +27800,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 27702 "Photo.c"
+#line 27800 "Photo.c"
 			}
 #line 3840 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = err;
@@ -27712,7 +27810,7 @@ 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 27712 "Photo.c"
+#line 27810 "Photo.c"
 			goto __finally389;
 		}
 		__finally389:
@@ -27726,7 +27824,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 27726 "Photo.c"
+#line 27824 "Photo.c"
 		}
 #line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = editable_file_format;
@@ -27744,7 +27842,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 27744 "Photo.c"
+#line 27842 "Photo.c"
 		}
 #line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = create_editable_file;
@@ -27754,7 +27852,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 27754 "Photo.c"
+#line 27852 "Photo.c"
 	}
 #line 3849 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = current_editable_file;
@@ -27764,7 +27862,7 @@ 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 27764 "Photo.c"
+#line 27862 "Photo.c"
 		GFile* _tmp46_ = NULL;
 #line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = current_editable_file;
@@ -27780,7 +27878,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 27780 "Photo.c"
+#line 27878 "Photo.c"
 		}
 	}
 #line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27799,13 +27897,13 @@ 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 27799 "Photo.c"
+#line 27897 "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 27805 "Photo.c"
+#line 27903 "Photo.c"
 }
 
 
@@ -27817,14 +27915,14 @@ void photo_revert_to_master (Photo* self, gboolean notify) {
 	_tmp0_ = notify;
 #line 3859 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_detach_editable (self, TRUE, TRUE, _tmp0_);
-#line 27817 "Photo.c"
+#line 27915 "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 27824 "Photo.c"
+#line 27922 "Photo.c"
 }
 
 
@@ -27858,7 +27956,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 27858 "Photo.c"
+#line 27956 "Photo.c"
 	}
 #line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp1_;
@@ -27874,7 +27972,7 @@ 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 27874 "Photo.c"
+#line 27972 "Photo.c"
 }
 
 
@@ -27894,7 +27992,7 @@ static void photo_halt_monitoring_editable (Photo* self) {
 	if (_tmp0_ == NULL) {
 #line 3874 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27894 "Photo.c"
+#line 27992 "Photo.c"
 	}
 #line 3877 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_editable_file (self);
@@ -27904,13 +28002,13 @@ static void photo_halt_monitoring_editable (Photo* self) {
 	_tmp2_ = file;
 #line 3878 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 27904 "Photo.c"
+#line 28002 "Photo.c"
 		GFile* _tmp3_ = NULL;
 #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 27910 "Photo.c"
+#line 28008 "Photo.c"
 	}
 #line 3881 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = self->priv->editable_monitor;
@@ -27928,7 +28026,7 @@ 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 27928 "Photo.c"
+#line 28026 "Photo.c"
 }
 
 
@@ -27970,7 +28068,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 27970 "Photo.c"
+#line 28068 "Photo.c"
 	}
 }
 
@@ -27987,7 +28085,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 27987 "Photo.c"
+#line 28085 "Photo.c"
 	}
 }
 
@@ -28004,7 +28102,7 @@ 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 28004 "Photo.c"
+#line 28102 "Photo.c"
 	}
 }
 
@@ -28016,13 +28114,13 @@ static void _vala_array_add103 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28016 "Photo.c"
+#line 28114 "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 28022 "Photo.c"
+#line 28120 "Photo.c"
 }
 
 
@@ -28033,13 +28131,13 @@ static void _vala_array_add104 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28033 "Photo.c"
+#line 28131 "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 28039 "Photo.c"
+#line 28137 "Photo.c"
 }
 
 
@@ -28050,13 +28148,13 @@ static void _vala_array_add105 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28050 "Photo.c"
+#line 28148 "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 28056 "Photo.c"
+#line 28154 "Photo.c"
 }
 
 
@@ -28067,13 +28165,13 @@ static void _vala_array_add106 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28067 "Photo.c"
+#line 28165 "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 28073 "Photo.c"
+#line 28171 "Photo.c"
 }
 
 
@@ -28084,13 +28182,13 @@ static void _vala_array_add107 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28084 "Photo.c"
+#line 28182 "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 28090 "Photo.c"
+#line 28188 "Photo.c"
 }
 
 
@@ -28101,13 +28199,13 @@ static void _vala_array_add108 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28101 "Photo.c"
+#line 28199 "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 28107 "Photo.c"
+#line 28205 "Photo.c"
 }
 
 
@@ -28158,30 +28256,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 28158 "Photo.c"
+#line 28256 "Photo.c"
 		PhotoFileReader* _tmp3_ = NULL;
 #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 28164 "Photo.c"
+#line 28262 "Photo.c"
 	} else {
 #line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = FALSE;
-#line 28168 "Photo.c"
+#line 28266 "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 28174 "Photo.c"
+#line 28272 "Photo.c"
 	} else {
 		gboolean _tmp4_ = FALSE;
 #line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = only_attributes;
 #line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = !_tmp4_;
-#line 28181 "Photo.c"
+#line 28279 "Photo.c"
 	}
 #line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp0_, "(only_attributes && new_reader == null) || (!only_attributes)");
@@ -28195,13 +28293,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 28195 "Photo.c"
+#line 28293 "Photo.c"
 		PhotoFileReader* _tmp8_ = NULL;
 #line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = old_reader;
 #line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp8_;
-#line 28201 "Photo.c"
+#line 28299 "Photo.c"
 	}
 #line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _photo_file_adapter_ref0 (_tmp6_);
@@ -28219,7 +28317,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 28219 "Photo.c"
+#line 28317 "Photo.c"
 	}
 #line 3918 "/home/jens/Source/shotwell/src/Photo.vala"
 	timestamp_changed = FALSE;
@@ -28261,19 +28359,19 @@ 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 28261 "Photo.c"
+#line 28359 "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 28267 "Photo.c"
+#line 28365 "Photo.c"
 		BackingPhotoRow* _tmp18_ = NULL;
 #line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = backing;
 #line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp18_ != NULL) {
-#line 28273 "Photo.c"
+#line 28371 "Photo.c"
 			BackingPhotoTable* _tmp19_ = NULL;
 			BackingPhotoTable* _tmp20_ = NULL;
 			BackingPhotoRow* _tmp21_ = NULL;
@@ -28303,7 +28401,7 @@ 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 28303 "Photo.c"
+#line 28401 "Photo.c"
 			}
 			{
 				PhotoRow* _tmp22_ = NULL;
@@ -28311,7 +28409,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				_tmp22_ = self->row;
 #line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_lock (&self->priv->__lock_row);
-#line 28311 "Photo.c"
+#line 28409 "Photo.c"
 				{
 					PhotoTable* _tmp23_ = NULL;
 					PhotoTable* _tmp24_ = NULL;
@@ -28344,7 +28442,7 @@ 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 28344 "Photo.c"
+#line 28442 "Photo.c"
 						goto __finally391;
 					}
 #line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28369,7 +28467,7 @@ 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 28369 "Photo.c"
+#line 28467 "Photo.c"
 				}
 				__finally391:
 				{
@@ -28378,7 +28476,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 					_tmp34_ = self->row;
 #line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 28378 "Photo.c"
+#line 28476 "Photo.c"
 				}
 #line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -28396,19 +28494,19 @@ 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 28396 "Photo.c"
+#line 28494 "Photo.c"
 				}
 			}
 		}
 #line 3944 "/home/jens/Source/shotwell/src/Photo.vala"
 		is_new_editable = TRUE;
-#line 28402 "Photo.c"
+#line 28500 "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 28408 "Photo.c"
+#line 28506 "Photo.c"
 		gboolean _tmp36_ = FALSE;
 		GFileInfo* info = NULL;
 		GTimeVal timestamp = {0};
@@ -28425,7 +28523,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		_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 28425 "Photo.c"
+#line 28523 "Photo.c"
 		{
 			GFileInfo* _tmp37_ = NULL;
 			GFile* _tmp38_ = NULL;
@@ -28439,7 +28537,7 @@ 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 28439 "Photo.c"
+#line 28537 "Photo.c"
 				goto __catch392_g_error;
 			}
 #line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28452,7 +28550,7 @@ 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 28452 "Photo.c"
+#line 28550 "Photo.c"
 		}
 		goto __finally392;
 		__catch392_g_error:
@@ -28496,7 +28594,7 @@ 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 28496 "Photo.c"
+#line 28594 "Photo.c"
 		}
 		__finally392:
 #line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28517,7 +28615,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 28517 "Photo.c"
+#line 28615 "Photo.c"
 		}
 #line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = info;
@@ -28561,7 +28659,7 @@ 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 28561 "Photo.c"
+#line 28659 "Photo.c"
 		}
 		{
 			PhotoRow* _tmp54_ = NULL;
@@ -28569,7 +28667,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			_tmp54_ = self->row;
 #line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 28569 "Photo.c"
+#line 28667 "Photo.c"
 			{
 				BackingPhotoRow* _tmp55_ = NULL;
 				time_t _tmp56_ = 0;
@@ -28621,7 +28719,7 @@ 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 28621 "Photo.c"
+#line 28719 "Photo.c"
 			}
 			__finally393:
 			{
@@ -28630,7 +28728,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				_tmp69_ = self->row;
 #line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 28630 "Photo.c"
+#line 28728 "Photo.c"
 			}
 #line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -28650,12 +28748,12 @@ 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 28650 "Photo.c"
+#line 28748 "Photo.c"
 			}
 		}
 #line 3947 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 28655 "Photo.c"
+#line 28753 "Photo.c"
 	} else {
 		gboolean _tmp70_ = FALSE;
 		gboolean _tmp71_ = FALSE;
@@ -28663,21 +28761,21 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		_tmp71_ = backing_photo_id_is_valid (&editable_id);
 #line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp71_) {
-#line 28663 "Photo.c"
+#line 28761 "Photo.c"
 			gboolean _tmp72_ = FALSE;
 #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 28669 "Photo.c"
+#line 28767 "Photo.c"
 		} else {
 #line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp70_ = FALSE;
-#line 28673 "Photo.c"
+#line 28771 "Photo.c"
 		}
 #line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp70_) {
-#line 28677 "Photo.c"
+#line 28775 "Photo.c"
 			BackingPhotoRow* _tmp73_ = NULL;
 			BackingPhotoID _tmp74_ = {0};
 			BackingPhotoTable* _tmp75_ = NULL;
@@ -28715,7 +28813,7 @@ 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 28715 "Photo.c"
+#line 28813 "Photo.c"
 			}
 			{
 				PhotoRow* _tmp78_ = NULL;
@@ -28723,7 +28821,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				_tmp78_ = self->row;
 #line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_lock (&self->priv->__lock_row);
-#line 28723 "Photo.c"
+#line 28821 "Photo.c"
 				{
 					BackingPhotoRow* _tmp79_ = NULL;
 					time_t _tmp80_ = 0;
@@ -28781,7 +28879,7 @@ 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 28781 "Photo.c"
+#line 28879 "Photo.c"
 				}
 				__finally394:
 				{
@@ -28790,7 +28888,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 					_tmp93_ = self->row;
 #line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 28790 "Photo.c"
+#line 28888 "Photo.c"
 				}
 #line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -28808,7 +28906,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 28808 "Photo.c"
+#line 28906 "Photo.c"
 				}
 			}
 		}
@@ -28817,14 +28915,14 @@ 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 28817 "Photo.c"
+#line 28915 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp95_ = NULL;
 #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 28824 "Photo.c"
+#line 28922 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp96_ = NULL;
 				PhotoFileReader* _tmp97_ = NULL;
@@ -28839,7 +28937,7 @@ 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 28839 "Photo.c"
+#line 28937 "Photo.c"
 			}
 			__finally395:
 			{
@@ -28848,7 +28946,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				_tmp99_ = self->priv->readers;
 #line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 28848 "Photo.c"
+#line 28946 "Photo.c"
 			}
 #line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -28866,7 +28964,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 28866 "Photo.c"
+#line 28964 "Photo.c"
 			}
 		}
 	}
@@ -28874,7 +28972,7 @@ 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 28874 "Photo.c"
+#line 28972 "Photo.c"
 		PhotoFileReader* _tmp102_ = NULL;
 		PhotoFileReader* _tmp103_ = NULL;
 #line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28883,15 +28981,15 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		_tmp103_ = old_reader;
 #line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp100_ = _tmp102_ != _tmp103_;
-#line 28883 "Photo.c"
+#line 28981 "Photo.c"
 	} else {
 #line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp100_ = FALSE;
-#line 28887 "Photo.c"
+#line 28985 "Photo.c"
 	}
 #line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp100_) {
-#line 28891 "Photo.c"
+#line 28989 "Photo.c"
 		GFile* _tmp104_ = NULL;
 		PhotoFileReader* _tmp105_ = NULL;
 		GFile* _tmp108_ = NULL;
@@ -28902,7 +29000,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		_tmp105_ = old_reader;
 #line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp105_ != NULL) {
-#line 28902 "Photo.c"
+#line 29000 "Photo.c"
 			PhotoFileReader* _tmp106_ = NULL;
 			GFile* _tmp107_ = NULL;
 #line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28913,19 +29011,19 @@ 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 28913 "Photo.c"
+#line 29011 "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 28919 "Photo.c"
+#line 29017 "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 28925 "Photo.c"
+#line 29023 "Photo.c"
 			PhotoFileReader* _tmp110_ = NULL;
 			GFile* _tmp111_ = NULL;
 #line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28936,13 +29034,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 28936 "Photo.c"
+#line 29034 "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 28942 "Photo.c"
+#line 29040 "Photo.c"
 		}
 #line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_editable_replaced (self, _tmp104_, _tmp108_);
@@ -28950,7 +29048,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 28950 "Photo.c"
+#line 29048 "Photo.c"
 	}
 #line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp112_ = g_new0 (gchar*, 0 + 1);
@@ -28964,7 +29062,7 @@ 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 28964 "Photo.c"
+#line 29062 "Photo.c"
 		gchar** _tmp114_ = NULL;
 		gint _tmp114__length1 = 0;
 		gchar* _tmp115_ = NULL;
@@ -28992,7 +29090,7 @@ 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 28992 "Photo.c"
+#line 29090 "Photo.c"
 			gchar** _tmp119_ = NULL;
 			gint _tmp119__length1 = 0;
 			gchar* _tmp120_ = NULL;
@@ -29004,7 +29102,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 29004 "Photo.c"
+#line 29102 "Photo.c"
 		}
 	}
 #line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29013,18 +29111,18 @@ 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 29013 "Photo.c"
+#line 29111 "Photo.c"
 	} else {
 		PhotoFileReader* _tmp123_ = NULL;
 #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 29020 "Photo.c"
+#line 29118 "Photo.c"
 	}
 #line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp121_) {
-#line 29024 "Photo.c"
+#line 29122 "Photo.c"
 		gchar** _tmp124_ = NULL;
 		gint _tmp124__length1 = 0;
 		gchar* _tmp125_ = NULL;
@@ -29052,7 +29150,7 @@ 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 29052 "Photo.c"
+#line 29150 "Photo.c"
 			gchar** _tmp129_ = NULL;
 			gint _tmp129__length1 = 0;
 			gchar* _tmp130_ = NULL;
@@ -29064,7 +29162,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 29064 "Photo.c"
+#line 29162 "Photo.c"
 		}
 	}
 #line 4022 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29073,7 +29171,7 @@ 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 29073 "Photo.c"
+#line 29171 "Photo.c"
 		gchar** _tmp132_ = NULL;
 		gint _tmp132__length1 = 0;
 		Alteration* _tmp133_ = NULL;
@@ -29090,7 +29188,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 29090 "Photo.c"
+#line 29188 "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);
@@ -29104,7 +29202,7 @@ 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 29104 "Photo.c"
+#line 29202 "Photo.c"
 }
 
 
@@ -29128,14 +29226,14 @@ 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 29128 "Photo.c"
+#line 29226 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #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 29135 "Photo.c"
+#line 29233 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -29145,7 +29243,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			_tmp2_ = _tmp1_->editable;
 #line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 29145 "Photo.c"
+#line 29243 "Photo.c"
 				PhotoBackingReaders* _tmp3_ = NULL;
 				PhotoFileReader* _tmp4_ = NULL;
 				GFile* _tmp5_ = NULL;
@@ -29168,7 +29266,7 @@ 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 29168 "Photo.c"
+#line 29266 "Photo.c"
 			}
 		}
 		__finally396:
@@ -29178,7 +29276,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			_tmp7_ = self->priv->readers;
 #line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 29178 "Photo.c"
+#line 29276 "Photo.c"
 		}
 #line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -29190,18 +29288,18 @@ 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 29190 "Photo.c"
+#line 29288 "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 29197 "Photo.c"
+#line 29295 "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 29201 "Photo.c"
+#line 29299 "Photo.c"
 		{
 			{
 				PhotoRow* _tmp9_ = NULL;
@@ -29209,7 +29307,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 				_tmp9_ = self->row;
 #line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_lock (&self->priv->__lock_row);
-#line 29209 "Photo.c"
+#line 29307 "Photo.c"
 				{
 					PhotoRow* _tmp10_ = NULL;
 					BackingPhotoID _tmp11_ = {0};
@@ -29227,7 +29325,7 @@ 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 29227 "Photo.c"
+#line 29325 "Photo.c"
 						PhotoTable* _tmp13_ = NULL;
 						PhotoTable* _tmp14_ = NULL;
 						PhotoRow* _tmp15_ = NULL;
@@ -29243,7 +29341,7 @@ 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 29243 "Photo.c"
+#line 29341 "Photo.c"
 							goto __finally398;
 						}
 					}
@@ -29257,7 +29355,7 @@ 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 29257 "Photo.c"
+#line 29355 "Photo.c"
 				}
 				__finally398:
 				{
@@ -29266,13 +29364,13 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 					_tmp19_ = self->row;
 #line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 29266 "Photo.c"
+#line 29364 "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 29272 "Photo.c"
+#line 29370 "Photo.c"
 						goto __catch397_database_error;
 					}
 #line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29283,7 +29381,7 @@ 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 29283 "Photo.c"
+#line 29381 "Photo.c"
 				}
 			}
 		}
@@ -29305,7 +29403,7 @@ 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 29305 "Photo.c"
+#line 29403 "Photo.c"
 		}
 		__finally397:
 #line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29318,7 +29416,7 @@ 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 29318 "Photo.c"
+#line 29416 "Photo.c"
 		}
 		{
 			gboolean _tmp22_ = FALSE;
@@ -29326,7 +29424,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			_tmp22_ = backing_photo_id_is_valid (&editable_id);
 #line 4053 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp22_) {
-#line 29326 "Photo.c"
+#line 29424 "Photo.c"
 				BackingPhotoTable* _tmp23_ = NULL;
 				BackingPhotoTable* _tmp24_ = NULL;
 				BackingPhotoID _tmp25_ = {0};
@@ -29344,7 +29442,7 @@ 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 29344 "Photo.c"
+#line 29442 "Photo.c"
 						goto __catch399_database_error;
 					}
 #line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29355,7 +29453,7 @@ 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 29355 "Photo.c"
+#line 29453 "Photo.c"
 				}
 			}
 		}
@@ -29377,7 +29475,7 @@ 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 29377 "Photo.c"
+#line 29475 "Photo.c"
 		}
 		__finally399:
 #line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29390,7 +29488,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 29390 "Photo.c"
+#line 29488 "Photo.c"
 		}
 	}
 #line 4060 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29399,13 +29497,13 @@ 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 29399 "Photo.c"
+#line 29497 "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 29405 "Photo.c"
+#line 29503 "Photo.c"
 		GFile* _tmp30_ = NULL;
 #line 4064 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_baseline_replaced (self);
@@ -29413,27 +29511,27 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 		_tmp30_ = editable_file;
 #line 4065 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_editable_replaced (self, _tmp30_, NULL);
-#line 29413 "Photo.c"
+#line 29511 "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 29419 "Photo.c"
+#line 29517 "Photo.c"
 		GFile* _tmp33_ = NULL;
 #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 29425 "Photo.c"
+#line 29523 "Photo.c"
 	} else {
 #line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = FALSE;
-#line 29429 "Photo.c"
+#line 29527 "Photo.c"
 	}
 #line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp31_) {
-#line 29433 "Photo.c"
+#line 29531 "Photo.c"
 		{
 			GFile* _tmp34_ = NULL;
 #line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29442,7 +29540,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			g_file_trash (_tmp34_, NULL, &_inner_error_);
 #line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29442 "Photo.c"
+#line 29540 "Photo.c"
 				goto __catch400_g_error;
 			}
 		}
@@ -29483,7 +29581,7 @@ 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 29483 "Photo.c"
+#line 29581 "Photo.c"
 		}
 		__finally400:
 #line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29496,7 +29594,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 29496 "Photo.c"
+#line 29594 "Photo.c"
 		}
 	}
 #line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29505,32 +29603,32 @@ 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 29505 "Photo.c"
+#line 29603 "Photo.c"
 	} else {
 		gboolean _tmp45_ = FALSE;
 #line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = remove_transformations;
 #line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _tmp45_;
-#line 29512 "Photo.c"
+#line 29610 "Photo.c"
 	}
 #line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp43_) {
-#line 29516 "Photo.c"
+#line 29614 "Photo.c"
 		gboolean _tmp46_ = FALSE;
 #line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = notify;
 #line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = _tmp46_;
-#line 29522 "Photo.c"
+#line 29620 "Photo.c"
 	} else {
 #line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = FALSE;
-#line 29526 "Photo.c"
+#line 29624 "Photo.c"
 	}
 #line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp42_) {
-#line 29530 "Photo.c"
+#line 29628 "Photo.c"
 		Alteration* _tmp47_ = NULL;
 		Alteration* _tmp48_ = NULL;
 #line 4078 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29541,32 +29639,32 @@ 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 29541 "Photo.c"
+#line 29639 "Photo.c"
 	}
 #line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (editable_file);
-#line 29545 "Photo.c"
+#line 29643 "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 29552 "Photo.c"
+#line 29650 "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 29559 "Photo.c"
+#line 29657 "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 29566 "Photo.c"
+#line 29664 "Photo.c"
 }
 
 
@@ -29584,14 +29682,14 @@ 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 29584 "Photo.c"
+#line 29682 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #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 29591 "Photo.c"
+#line 29689 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -29626,18 +29724,18 @@ 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 29626 "Photo.c"
+#line 29724 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp10_ = NULL;
 #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 29633 "Photo.c"
+#line 29731 "Photo.c"
 				}
 #line 4090 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 29637 "Photo.c"
+#line 29735 "Photo.c"
 			}
 		}
 		__finally401:
@@ -29647,7 +29745,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 			_tmp11_ = self->priv->readers;
 #line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 29647 "Photo.c"
+#line 29745 "Photo.c"
 		}
 #line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -29657,7 +29755,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 29657 "Photo.c"
+#line 29755 "Photo.c"
 		}
 	}
 #line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29682,7 +29780,7 @@ 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 29682 "Photo.c"
+#line 29780 "Photo.c"
 		{
 			OneShotScheduler* _tmp18_ = NULL;
 			OneShotScheduler* _tmp20_ = NULL;
@@ -29690,7 +29788,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 			_tmp18_ = self->priv->reimport_editable_scheduler;
 #line 4099 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp18_ == NULL) {
-#line 29690 "Photo.c"
+#line 29788 "Photo.c"
 				OneShotScheduler* _tmp19_ = NULL;
 #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);
@@ -29698,7 +29796,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 				_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 29698 "Photo.c"
+#line 29796 "Photo.c"
 			}
 #line 4104 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = self->priv->reimport_editable_scheduler;
@@ -29706,11 +29804,11 @@ 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 29706 "Photo.c"
+#line 29804 "Photo.c"
 		}
 #line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
-#line 29710 "Photo.c"
+#line 29808 "Photo.c"
 		{
 			OneShotScheduler* _tmp21_ = NULL;
 			OneShotScheduler* _tmp23_ = NULL;
@@ -29718,7 +29816,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 			_tmp21_ = self->priv->update_editable_attributes_scheduler;
 #line 4108 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp21_ == NULL) {
-#line 29718 "Photo.c"
+#line 29816 "Photo.c"
 				OneShotScheduler* _tmp22_ = NULL;
 #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);
@@ -29726,7 +29824,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 				_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 29726 "Photo.c"
+#line 29824 "Photo.c"
 			}
 #line 4113 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp23_ = self->priv->update_editable_attributes_scheduler;
@@ -29734,11 +29832,11 @@ 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 29734 "Photo.c"
+#line 29832 "Photo.c"
 		}
 #line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_DELETED:
-#line 29738 "Photo.c"
+#line 29836 "Photo.c"
 		{
 			OneShotScheduler* _tmp24_ = NULL;
 			OneShotScheduler* _tmp26_ = NULL;
@@ -29746,7 +29844,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 			_tmp24_ = self->priv->remove_editable_scheduler;
 #line 4117 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp24_ == NULL) {
-#line 29746 "Photo.c"
+#line 29844 "Photo.c"
 				OneShotScheduler* _tmp25_ = NULL;
 #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);
@@ -29754,7 +29852,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 				_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 29754 "Photo.c"
+#line 29852 "Photo.c"
 			}
 #line 4122 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = self->priv->remove_editable_scheduler;
@@ -29762,21 +29860,21 @@ 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 29762 "Photo.c"
+#line 29860 "Photo.c"
 		}
 		default:
 #line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
-#line 29767 "Photo.c"
+#line 29865 "Photo.c"
 		{
 #line 4128 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 29771 "Photo.c"
+#line 29869 "Photo.c"
 		}
 	}
 #line 4133 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_discard_prefetched (self);
-#line 29776 "Photo.c"
+#line 29874 "Photo.c"
 }
 
 
@@ -29796,13 +29894,13 @@ 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 29796 "Photo.c"
+#line 29894 "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 29802 "Photo.c"
+#line 29900 "Photo.c"
 			goto __catch402_g_error;
 		}
 	}
@@ -29833,7 +29931,7 @@ 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 29832 "Photo.c"
+#line 29930 "Photo.c"
 	}
 	__finally402:
 #line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29844,7 +29942,7 @@ static void photo_on_reimport_editable (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 29843 "Photo.c"
+#line 29941 "Photo.c"
 	}
 }
 
@@ -29863,13 +29961,13 @@ 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 29862 "Photo.c"
+#line 29960 "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 29868 "Photo.c"
+#line 29966 "Photo.c"
 			goto __catch403_g_error;
 		}
 	}
@@ -29891,7 +29989,7 @@ 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 29890 "Photo.c"
+#line 29988 "Photo.c"
 	}
 	__finally403:
 #line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29902,7 +30000,7 @@ 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 29901 "Photo.c"
+#line 29999 "Photo.c"
 	}
 }
 
@@ -29932,7 +30030,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 29931 "Photo.c"
+#line 30029 "Photo.c"
 	}
 #line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = reader;
@@ -29946,7 +30044,7 @@ 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 29945 "Photo.c"
+#line 30043 "Photo.c"
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 #line 4165 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29963,7 +30061,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 29962 "Photo.c"
+#line 30060 "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));
@@ -29979,7 +30077,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 29978 "Photo.c"
+#line 30076 "Photo.c"
 }
 
 
@@ -30008,7 +30106,7 @@ void photo_get_original_dimensions (Photo* self, Dimensions* result) {
 	*result = _tmp3_;
 #line 4183 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 30007 "Photo.c"
+#line 30105 "Photo.c"
 }
 
 
@@ -30028,7 +30126,7 @@ void photo_get_master_dimensions (Photo* self, Dimensions* result) {
 	*result = _tmp2_;
 #line 4188 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 30027 "Photo.c"
+#line 30125 "Photo.c"
 }
 
 
@@ -30060,11 +30158,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 30059 "Photo.c"
+#line 30157 "Photo.c"
 		}
 #line 4197 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 30063 "Photo.c"
+#line 30161 "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_);
@@ -30080,7 +30178,7 @@ 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 30079 "Photo.c"
+#line 30177 "Photo.c"
 		Orientation _tmp6_ = 0;
 		Dimensions _tmp7_ = {0};
 		Box _tmp8_ = {0};
@@ -30095,14 +30193,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 30094 "Photo.c"
+#line 30192 "Photo.c"
 	} else {
 		Box _tmp10_ = {0};
 #line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = raw;
 #line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_crop = _tmp10_;
-#line 30101 "Photo.c"
+#line 30199 "Photo.c"
 	}
 #line 4208 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
@@ -30110,11 +30208,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 30109 "Photo.c"
+#line 30207 "Photo.c"
 	}
 #line 4208 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 30113 "Photo.c"
+#line 30211 "Photo.c"
 }
 
 
@@ -30232,7 +30330,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 30231 "Photo.c"
+#line 30329 "Photo.c"
 }
 
 
@@ -30255,11 +30353,11 @@ gboolean photo_get_straighten (Photo* self, gdouble* theta) {
 		if (theta) {
 #line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
 			*theta = _vala_theta;
-#line 30254 "Photo.c"
+#line 30352 "Photo.c"
 		}
 #line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 30258 "Photo.c"
+#line 30356 "Photo.c"
 	}
 #line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
@@ -30267,11 +30365,11 @@ gboolean photo_get_straighten (Photo* self, gdouble* theta) {
 	if (theta) {
 #line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
 		*theta = _vala_theta;
-#line 30266 "Photo.c"
+#line 30364 "Photo.c"
 	}
 #line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 30270 "Photo.c"
+#line 30368 "Photo.c"
 }
 
 
@@ -30283,7 +30381,7 @@ void photo_set_straighten (Photo* self, gdouble theta) {
 	_tmp0_ = theta;
 #line 4235 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_set_raw_straighten (self, _tmp0_);
-#line 30282 "Photo.c"
+#line 30380 "Photo.c"
 }
 
 
@@ -30367,7 +30465,7 @@ 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 30366 "Photo.c"
+#line 30464 "Photo.c"
 	{
 		gdouble y = 0.0;
 		gdouble _tmp5_ = 0.0;
@@ -30375,14 +30473,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 		_tmp5_ = r;
 #line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 		y = _tmp5_;
-#line 30374 "Photo.c"
+#line 30472 "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 30381 "Photo.c"
+#line 30479 "Photo.c"
 				gdouble _tmp8_ = 0.0;
 				gdouble theta = 0.0;
 				gdouble _tmp9_ = 0.0;
@@ -30402,13 +30500,13 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				gint _tmp21_ = 0;
 #line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp6_) {
-#line 30401 "Photo.c"
+#line 30499 "Photo.c"
 					gdouble _tmp7_ = 0.0;
 #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 30407 "Photo.c"
+#line 30505 "Photo.c"
 				}
 #line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = FALSE;
@@ -30418,7 +30516,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 30417 "Photo.c"
+#line 30515 "Photo.c"
 				}
 #line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = y;
@@ -30456,7 +30554,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 30455 "Photo.c"
+#line 30553 "Photo.c"
 			}
 		}
 	}
@@ -30502,14 +30600,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 30501 "Photo.c"
+#line 30599 "Photo.c"
 	} else {
 		gint _tmp39_ = 0;
 #line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = ymin;
 #line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp37_ = _tmp39_;
-#line 30508 "Photo.c"
+#line 30606 "Photo.c"
 	}
 #line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymin = _tmp37_;
@@ -30531,7 +30629,7 @@ 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 30530 "Photo.c"
+#line 30628 "Photo.c"
 		GdkPixbuf* _tmp48_ = NULL;
 		gint _tmp49_ = 0;
 		gint _tmp50_ = 0;
@@ -30543,20 +30641,20 @@ 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 30542 "Photo.c"
+#line 30640 "Photo.c"
 	} else {
 		gint _tmp51_ = 0;
 #line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp51_ = ymax;
 #line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _tmp51_;
-#line 30549 "Photo.c"
+#line 30647 "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 30555 "Photo.c"
+#line 30653 "Photo.c"
 	{
 		gint y_it = 0;
 		gint _tmp52_ = 0;
@@ -30564,14 +30662,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 		_tmp52_ = ymin;
 #line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 		y_it = _tmp52_;
-#line 30563 "Photo.c"
+#line 30661 "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 30570 "Photo.c"
+#line 30668 "Photo.c"
 				gint _tmp55_ = 0;
 				gint _tmp56_ = 0;
 				gint xmin = 0;
@@ -30596,13 +30694,13 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				gint _tmp87_ = 0;
 #line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp53_) {
-#line 30595 "Photo.c"
+#line 30693 "Photo.c"
 					gint _tmp54_ = 0;
 #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 30601 "Photo.c"
+#line 30699 "Photo.c"
 				}
 #line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp53_ = FALSE;
@@ -30614,7 +30712,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 30613 "Photo.c"
+#line 30711 "Photo.c"
 				}
 #line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp57_ = x_bounds_min;
@@ -30634,14 +30732,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 30633 "Photo.c"
+#line 30731 "Photo.c"
 				} else {
 					gint _tmp63_ = 0;
 #line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp63_ = xmin;
 #line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp61_ = _tmp63_;
-#line 30640 "Photo.c"
+#line 30738 "Photo.c"
 				}
 #line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmin = _tmp61_;
@@ -30667,7 +30765,7 @@ 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 30666 "Photo.c"
+#line 30764 "Photo.c"
 					GdkPixbuf* _tmp73_ = NULL;
 					gint _tmp74_ = 0;
 					gint _tmp75_ = 0;
@@ -30679,18 +30777,18 @@ 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 30678 "Photo.c"
+#line 30776 "Photo.c"
 				} else {
 					gint _tmp76_ = 0;
 #line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp76_ = xmax;
 #line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp68_ = _tmp76_;
-#line 30685 "Photo.c"
+#line 30783 "Photo.c"
 				}
 #line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmax = _tmp68_;
-#line 30689 "Photo.c"
+#line 30787 "Photo.c"
 				{
 					gint x_it = 0;
 					gint _tmp77_ = 0;
@@ -30698,14 +30796,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 					_tmp77_ = xmin;
 #line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 					x_it = _tmp77_;
-#line 30697 "Photo.c"
+#line 30795 "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 30704 "Photo.c"
+#line 30802 "Photo.c"
 							gint _tmp80_ = 0;
 							gint _tmp81_ = 0;
 							GdkPixbuf* _tmp82_ = NULL;
@@ -30715,13 +30813,13 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 							GdkPixbuf* _tmp86_ = NULL;
 #line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp78_) {
-#line 30714 "Photo.c"
+#line 30812 "Photo.c"
 								gint _tmp79_ = 0;
 #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 30720 "Photo.c"
+#line 30818 "Photo.c"
 							}
 #line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp78_ = FALSE;
@@ -30733,7 +30831,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 30732 "Photo.c"
+#line 30830 "Photo.c"
 							}
 #line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp82_ = pixbuf;
@@ -30747,7 +30845,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 30746 "Photo.c"
+#line 30844 "Photo.c"
 						}
 					}
 				}
@@ -30755,7 +30853,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 30754 "Photo.c"
+#line 30852 "Photo.c"
 			}
 		}
 	}
@@ -30785,7 +30883,7 @@ 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 30784 "Photo.c"
+#line 30882 "Photo.c"
 	{
 		gint y_it = 0;
 		gint _tmp97_ = 0;
@@ -30793,14 +30891,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 		_tmp97_ = ymin;
 #line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 		y_it = _tmp97_;
-#line 30792 "Photo.c"
+#line 30890 "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 30799 "Photo.c"
+#line 30897 "Photo.c"
 				gint _tmp100_ = 0;
 				gint _tmp101_ = 0;
 				gint xmin = 0;
@@ -30825,13 +30923,13 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				gint _tmp132_ = 0;
 #line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp98_) {
-#line 30824 "Photo.c"
+#line 30922 "Photo.c"
 					gint _tmp99_ = 0;
 #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 30830 "Photo.c"
+#line 30928 "Photo.c"
 				}
 #line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp98_ = FALSE;
@@ -30843,7 +30941,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 30842 "Photo.c"
+#line 30940 "Photo.c"
 				}
 #line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp102_ = x_bounds_min;
@@ -30863,14 +30961,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 30862 "Photo.c"
+#line 30960 "Photo.c"
 				} else {
 					gint _tmp108_ = 0;
 #line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp108_ = xmin;
 #line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp106_ = _tmp108_;
-#line 30869 "Photo.c"
+#line 30967 "Photo.c"
 				}
 #line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmin = _tmp106_;
@@ -30896,7 +30994,7 @@ 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 30895 "Photo.c"
+#line 30993 "Photo.c"
 					GdkPixbuf* _tmp118_ = NULL;
 					gint _tmp119_ = 0;
 					gint _tmp120_ = 0;
@@ -30908,18 +31006,18 @@ 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 30907 "Photo.c"
+#line 31005 "Photo.c"
 				} else {
 					gint _tmp121_ = 0;
 #line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp121_ = xmax;
 #line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp113_ = _tmp121_;
-#line 30914 "Photo.c"
+#line 31012 "Photo.c"
 				}
 #line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmax = _tmp113_;
-#line 30918 "Photo.c"
+#line 31016 "Photo.c"
 				{
 					gint x_it = 0;
 					gint _tmp122_ = 0;
@@ -30927,14 +31025,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 					_tmp122_ = xmin;
 #line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 					x_it = _tmp122_;
-#line 30926 "Photo.c"
+#line 31024 "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 30933 "Photo.c"
+#line 31031 "Photo.c"
 							gint _tmp125_ = 0;
 							gint _tmp126_ = 0;
 							GdkPixbuf* _tmp127_ = NULL;
@@ -30944,13 +31042,13 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 							GdkPixbuf* _tmp131_ = NULL;
 #line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp123_) {
-#line 30943 "Photo.c"
+#line 31041 "Photo.c"
 								gint _tmp124_ = 0;
 #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 30949 "Photo.c"
+#line 31047 "Photo.c"
 							}
 #line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp123_ = FALSE;
@@ -30962,7 +31060,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 30961 "Photo.c"
+#line 31059 "Photo.c"
 							}
 #line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp127_ = pixbuf;
@@ -30976,7 +31074,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 30975 "Photo.c"
+#line 31073 "Photo.c"
 						}
 					}
 				}
@@ -30984,7 +31082,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 30983 "Photo.c"
+#line 31081 "Photo.c"
 			}
 		}
 	}
@@ -30998,7 +31096,7 @@ 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 30997 "Photo.c"
+#line 31095 "Photo.c"
 }
 
 
@@ -31039,21 +31137,21 @@ 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 31038 "Photo.c"
+#line 31136 "Photo.c"
 		gint _tmp10_ = 0;
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = y;
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = _tmp10_ >= 0;
-#line 31044 "Photo.c"
+#line 31142 "Photo.c"
 	} else {
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = FALSE;
-#line 31048 "Photo.c"
+#line 31146 "Photo.c"
 	}
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_) {
-#line 31052 "Photo.c"
+#line 31150 "Photo.c"
 		gint _tmp11_ = 0;
 		GdkPixbuf* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
@@ -31068,15 +31166,15 @@ 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 31067 "Photo.c"
+#line 31165 "Photo.c"
 	} else {
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = FALSE;
-#line 31071 "Photo.c"
+#line 31169 "Photo.c"
 	}
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_) {
-#line 31075 "Photo.c"
+#line 31173 "Photo.c"
 		gint _tmp15_ = 0;
 		GdkPixbuf* _tmp16_ = NULL;
 		gint _tmp17_ = 0;
@@ -31091,15 +31189,15 @@ 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 31090 "Photo.c"
+#line 31188 "Photo.c"
 	} else {
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = FALSE;
-#line 31094 "Photo.c"
+#line 31192 "Photo.c"
 	}
 #line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 31098 "Photo.c"
+#line 31196 "Photo.c"
 		guchar* pixel_data = NULL;
 		GdkPixbuf* _tmp19_ = NULL;
 		guint8* _tmp20_ = NULL;
@@ -31171,7 +31269,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 31170 "Photo.c"
+#line 31268 "Photo.c"
 	}
 #line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = pixbuf;
@@ -31181,7 +31279,7 @@ 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 31180 "Photo.c"
+#line 31278 "Photo.c"
 }
 
 
@@ -31232,7 +31330,7 @@ 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 31231 "Photo.c"
+#line 31329 "Photo.c"
 		Box _tmp6_ = {0};
 		gint _tmp7_ = 0;
 		Box _tmp8_ = {0};
@@ -31249,7 +31347,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 31248 "Photo.c"
+#line 31346 "Photo.c"
 	}
 #line 4347 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = unscaled_orientation;
@@ -31277,7 +31375,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 31276 "Photo.c"
+#line 31374 "Photo.c"
 }
 
 
@@ -31389,7 +31487,7 @@ 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 31388 "Photo.c"
+#line 31486 "Photo.c"
 		gint temp = 0;
 		GdkPoint _tmp22_ = {0};
 		gint _tmp23_ = 0;
@@ -31412,7 +31510,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 31411 "Photo.c"
+#line 31509 "Photo.c"
 	}
 #line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = upper_left;
@@ -31424,7 +31522,7 @@ 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 31423 "Photo.c"
+#line 31521 "Photo.c"
 		gint temp = 0;
 		GdkPoint _tmp31_ = {0};
 		gint _tmp32_ = 0;
@@ -31447,7 +31545,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 31446 "Photo.c"
+#line 31544 "Photo.c"
 	}
 #line 4379 "/home/jens/Source/shotwell/src/Photo.vala"
 	memset (&raw_rect, 0, sizeof (GdkRectangle));
@@ -31487,7 +31585,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 31486 "Photo.c"
+#line 31584 "Photo.c"
 }
 
 
@@ -31502,7 +31600,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
 #line 4389 "/home/jens/Source/shotwell/src/Photo.vala"
 	pixbuf = NULL;
-#line 31501 "Photo.c"
+#line 31599 "Photo.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Scaling _tmp1_ = {0};
@@ -31516,7 +31614,7 @@ 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 31515 "Photo.c"
+#line 31613 "Photo.c"
 			goto __catch404_g_error;
 		}
 #line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31529,7 +31627,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 		pixbuf = _tmp3_;
 #line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp0_);
-#line 31528 "Photo.c"
+#line 31626 "Photo.c"
 	}
 	goto __finally404;
 	__catch404_g_error:
@@ -31549,7 +31647,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 		_g_object_unref0 (pixbuf);
 #line 4405 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 31548 "Photo.c"
+#line 31646 "Photo.c"
 	}
 	__finally404:
 #line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31562,7 +31660,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 31561 "Photo.c"
+#line 31659 "Photo.c"
 	}
 #line 4412 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = pixbuf;
@@ -31576,7 +31674,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 	_g_object_unref0 (pixbuf);
 #line 4420 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31575 "Photo.c"
+#line 31673 "Photo.c"
 }
 
 
@@ -31602,7 +31700,7 @@ gboolean photo_enhance (Photo* self) {
 		_pixel_transformation_bundle_unref0 (transformations);
 #line 4427 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 31601 "Photo.c"
+#line 31699 "Photo.c"
 	}
 	{
 		PhotoRow* _tmp2_ = NULL;
@@ -31610,14 +31708,14 @@ gboolean photo_enhance (Photo* self) {
 		_tmp2_ = self->row;
 #line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 31609 "Photo.c"
+#line 31707 "Photo.c"
 		{
 			PixelTransformationBundle* _tmp3_ = NULL;
 #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 31616 "Photo.c"
+#line 31714 "Photo.c"
 		}
 		__finally405:
 		{
@@ -31626,10 +31724,12 @@ gboolean photo_enhance (Photo* self) {
 			_tmp4_ = self->row;
 #line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 31625 "Photo.c"
+#line 31723 "Photo.c"
 		}
 #line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 31727 "Photo.c"
+			gboolean _tmp5_ = FALSE;
 #line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformation_bundle_unref0 (transformations);
 #line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31637,8 +31737,8 @@ gboolean photo_enhance (Photo* self) {
 #line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
 #line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
-			return FALSE;
-#line 31637 "Photo.c"
+			return _tmp5_;
+#line 31737 "Photo.c"
 		}
 	}
 #line 4440 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31647,7 +31747,7 @@ gboolean photo_enhance (Photo* self) {
 	_pixel_transformation_bundle_unref0 (transformations);
 #line 4440 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31646 "Photo.c"
+#line 31746 "Photo.c"
 }
 
 
@@ -31660,7 +31760,7 @@ gboolean photo_get_develop_raw_photos_to_files (void) {
 	result = _tmp0_;
 #line 349 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31659 "Photo.c"
+#line 31759 "Photo.c"
 }
 
 
@@ -31670,7 +31770,7 @@ void photo_set_develop_raw_photos_to_files (gboolean value) {
 	_tmp0_ = value;
 #line 349 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo__develop_raw_photos_to_files = _tmp0_;
-#line 31669 "Photo.c"
+#line 31769 "Photo.c"
 }
 
 
@@ -31679,7 +31779,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 31678 "Photo.c"
+#line 31778 "Photo.c"
 }
 
 
@@ -31698,19 +31798,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 31697 "Photo.c"
+#line 31797 "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 31703 "Photo.c"
+#line 31803 "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 31709 "Photo.c"
+#line 31809 "Photo.c"
 }
 
 
@@ -31725,7 +31825,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 31724 "Photo.c"
+#line 31824 "Photo.c"
 }
 
 
@@ -31744,47 +31844,47 @@ 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 31743 "Photo.c"
+#line 31843 "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 31749 "Photo.c"
+#line 31849 "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 31755 "Photo.c"
+#line 31855 "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 31762 "Photo.c"
+#line 31862 "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 31769 "Photo.c"
+#line 31869 "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 31776 "Photo.c"
+#line 31876 "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 31783 "Photo.c"
+#line 31883 "Photo.c"
 }
 
 
@@ -31852,14 +31952,14 @@ 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 31851 "Photo.c"
+#line 31951 "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 31858 "Photo.c"
+#line 31958 "Photo.c"
 }
 
 
@@ -31874,7 +31974,7 @@ static Orientation photo_photo_transformation_state_impl_get_orientation (PhotoP
 	result = _tmp0_;
 #line 261 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31873 "Photo.c"
+#line 31973 "Photo.c"
 }
 
 
@@ -31892,7 +31992,7 @@ static GeeHashMap* photo_photo_transformation_state_impl_get_transformations (Ph
 	result = _tmp1_;
 #line 265 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31891 "Photo.c"
+#line 31991 "Photo.c"
 }
 
 
@@ -31906,7 +32006,7 @@ static PixelTransformer* photo_photo_transformation_state_impl_get_transformer (
 	_tmp1_ = self->priv->transformer;
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 31905 "Photo.c"
+#line 32005 "Photo.c"
 		PixelTransformer* _tmp2_ = NULL;
 		PixelTransformer* _tmp3_ = NULL;
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31917,19 +32017,19 @@ 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 31916 "Photo.c"
+#line 32016 "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 31922 "Photo.c"
+#line 32022 "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 31928 "Photo.c"
+#line 32028 "Photo.c"
 }
 
 
@@ -31943,7 +32043,7 @@ static PixelTransformationBundle* photo_photo_transformation_state_impl_get_colo
 	_tmp1_ = self->priv->adjustments;
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 31942 "Photo.c"
+#line 32042 "Photo.c"
 		PixelTransformationBundle* _tmp2_ = NULL;
 		PixelTransformationBundle* _tmp3_ = NULL;
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31954,19 +32054,19 @@ 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 31953 "Photo.c"
+#line 32053 "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 31959 "Photo.c"
+#line 32059 "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 31965 "Photo.c"
+#line 32065 "Photo.c"
 }
 
 
@@ -31985,13 +32085,13 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G
 		result = NULL;
 #line 279 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 31984 "Photo.c"
+#line 32084 "Photo.c"
 	}
 #line 281 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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 31990 "Photo.c"
+#line 32090 "Photo.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeHashMap* _tmp2_ = NULL;
@@ -32003,7 +32103,7 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = original;
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MAP, GeeMap));
+		_tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp3_;
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32018,7 +32118,7 @@ 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 32017 "Photo.c"
+#line 32117 "Photo.c"
 			GeeIterator* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
 			gchar* object = NULL;
@@ -32040,7 +32140,7 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G
 			if (!_tmp9_) {
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 32039 "Photo.c"
+#line 32139 "Photo.c"
 			}
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = _object_it;
@@ -32072,17 +32172,17 @@ 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 32071 "Photo.c"
+#line 32171 "Photo.c"
 		}
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_object_it);
-#line 32075 "Photo.c"
+#line 32175 "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 32081 "Photo.c"
+#line 32181 "Photo.c"
 }
 
 
@@ -32096,7 +32196,7 @@ static void photo_photo_transformation_state_impl_on_photo_baseline_replaced (Ph
 	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 32095 "Photo.c"
+#line 32195 "Photo.c"
 	}
 }
 
@@ -32108,14 +32208,14 @@ 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 32107 "Photo.c"
+#line 32207 "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 32114 "Photo.c"
+#line 32214 "Photo.c"
 }
 
 
@@ -32141,7 +32241,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 32140 "Photo.c"
+#line 32240 "Photo.c"
 }
 
 
@@ -32163,21 +32263,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 32162 "Photo.c"
+#line 32262 "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 32169 "Photo.c"
+#line 32269 "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 32176 "Photo.c"
+#line 32276 "Photo.c"
 }
 
 
@@ -32186,7 +32286,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 32185 "Photo.c"
+#line 32285 "Photo.c"
 	}
 }
 
@@ -32196,11 +32296,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 32195 "Photo.c"
+#line 32295 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 32199 "Photo.c"
+#line 32299 "Photo.c"
 	}
 }
 
@@ -32208,37 +32308,37 @@ 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 32207 "Photo.c"
+#line 32307 "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 32214 "Photo.c"
+#line 32314 "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 32221 "Photo.c"
+#line 32321 "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 32225 "Photo.c"
+#line 32325 "Photo.c"
 		}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_backing_readers_ref (object);
-#line 32229 "Photo.c"
+#line 32329 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32233 "Photo.c"
+#line 32333 "Photo.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32237 "Photo.c"
+#line 32337 "Photo.c"
 }
 
 
@@ -32249,25 +32349,25 @@ static gchar* photo_value_backing_readers_lcopy_value (const GValue* value, guin
 	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 32248 "Photo.c"
+#line 32348 "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 32254 "Photo.c"
+#line 32354 "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 32258 "Photo.c"
+#line 32358 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_backing_readers_ref (value->data[0].v_pointer);
-#line 32262 "Photo.c"
+#line 32362 "Photo.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32266 "Photo.c"
+#line 32366 "Photo.c"
 }
 
 
@@ -32281,7 +32381,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 32280 "Photo.c"
+#line 32380 "Photo.c"
 }
 
 
@@ -32290,7 +32390,7 @@ 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 32289 "Photo.c"
+#line 32389 "Photo.c"
 }
 
 
@@ -32310,17 +32410,17 @@ 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 32309 "Photo.c"
+#line 32409 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32313 "Photo.c"
+#line 32413 "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 32319 "Photo.c"
+#line 32419 "Photo.c"
 	}
 }
 
@@ -32339,17 +32439,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 32338 "Photo.c"
+#line 32438 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32342 "Photo.c"
+#line 32442 "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 32348 "Photo.c"
+#line 32448 "Photo.c"
 	}
 }
 
@@ -32359,14 +32459,14 @@ 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 32358 "Photo.c"
+#line 32458 "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 32365 "Photo.c"
+#line 32465 "Photo.c"
 }
 
 
@@ -32382,7 +32482,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 32381 "Photo.c"
+#line 32481 "Photo.c"
 }
 
 
@@ -32407,7 +32507,7 @@ static gpointer photo_backing_readers_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 32406 "Photo.c"
+#line 32506 "Photo.c"
 }
 
 
@@ -32420,7 +32520,7 @@ 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 32419 "Photo.c"
+#line 32519 "Photo.c"
 	}
 }
 
@@ -32455,21 +32555,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 32454 "Photo.c"
+#line 32554 "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 32461 "Photo.c"
+#line 32561 "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 32468 "Photo.c"
+#line 32568 "Photo.c"
 }
 
 
@@ -32478,7 +32578,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 32477 "Photo.c"
+#line 32577 "Photo.c"
 	}
 }
 
@@ -32488,11 +32588,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 32487 "Photo.c"
+#line 32587 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 32491 "Photo.c"
+#line 32591 "Photo.c"
 	}
 }
 
@@ -32500,37 +32600,37 @@ 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 32499 "Photo.c"
+#line 32599 "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 32506 "Photo.c"
+#line 32606 "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 32513 "Photo.c"
+#line 32613 "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 32517 "Photo.c"
+#line 32617 "Photo.c"
 		}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_cached_pixbuf_ref (object);
-#line 32521 "Photo.c"
+#line 32621 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32525 "Photo.c"
+#line 32625 "Photo.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32529 "Photo.c"
+#line 32629 "Photo.c"
 }
 
 
@@ -32541,25 +32641,25 @@ static gchar* photo_value_cached_pixbuf_lcopy_value (const GValue* value, guint
 	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 32540 "Photo.c"
+#line 32640 "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 32546 "Photo.c"
+#line 32646 "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 32550 "Photo.c"
+#line 32650 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_cached_pixbuf_ref (value->data[0].v_pointer);
-#line 32554 "Photo.c"
+#line 32654 "Photo.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32558 "Photo.c"
+#line 32658 "Photo.c"
 }
 
 
@@ -32573,7 +32673,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 32572 "Photo.c"
+#line 32672 "Photo.c"
 }
 
 
@@ -32582,7 +32682,7 @@ 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 32581 "Photo.c"
+#line 32681 "Photo.c"
 }
 
 
@@ -32602,17 +32702,17 @@ 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 32601 "Photo.c"
+#line 32701 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32605 "Photo.c"
+#line 32705 "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 32611 "Photo.c"
+#line 32711 "Photo.c"
 	}
 }
 
@@ -32631,17 +32731,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 32630 "Photo.c"
+#line 32730 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32634 "Photo.c"
+#line 32734 "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 32640 "Photo.c"
+#line 32740 "Photo.c"
 	}
 }
 
@@ -32651,7 +32751,7 @@ 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 32650 "Photo.c"
+#line 32750 "Photo.c"
 }
 
 
@@ -32663,7 +32763,7 @@ static void photo_cached_pixbuf_instance_init (PhotoCachedPixbuf * self) {
 	self->last_touched = _tmp0_;
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 32662 "Photo.c"
+#line 32762 "Photo.c"
 }
 
 
@@ -32679,7 +32779,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 32678 "Photo.c"
+#line 32778 "Photo.c"
 }
 
 
@@ -32704,7 +32804,7 @@ static gpointer photo_cached_pixbuf_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 32703 "Photo.c"
+#line 32803 "Photo.c"
 }
 
 
@@ -32717,7 +32817,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 32716 "Photo.c"
+#line 32816 "Photo.c"
 	}
 }
 
@@ -32728,14 +32828,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 32727 "Photo.c"
+#line 32827 "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 32734 "Photo.c"
+#line 32834 "Photo.c"
 }
 
 
@@ -32744,7 +32844,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 32743 "Photo.c"
+#line 32843 "Photo.c"
 	}
 }
 
@@ -32754,11 +32854,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 32753 "Photo.c"
+#line 32853 "Photo.c"
 	} else {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 32757 "Photo.c"
+#line 32857 "Photo.c"
 	}
 }
 
@@ -32766,37 +32866,37 @@ 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 32765 "Photo.c"
+#line 32865 "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 32772 "Photo.c"
+#line 32872 "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 32779 "Photo.c"
+#line 32879 "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 32783 "Photo.c"
+#line 32883 "Photo.c"
 		}
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_master_state_ref (object);
-#line 32787 "Photo.c"
+#line 32887 "Photo.c"
 	} else {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32791 "Photo.c"
+#line 32891 "Photo.c"
 	}
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32795 "Photo.c"
+#line 32895 "Photo.c"
 }
 
 
@@ -32807,25 +32907,25 @@ static gchar* photo_value_reimport_master_state_lcopy_value (const GValue* value
 	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 32806 "Photo.c"
+#line 32906 "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 32812 "Photo.c"
+#line 32912 "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 32816 "Photo.c"
+#line 32916 "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 32820 "Photo.c"
+#line 32920 "Photo.c"
 	}
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32824 "Photo.c"
+#line 32924 "Photo.c"
 }
 
 
@@ -32839,7 +32939,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 32838 "Photo.c"
+#line 32938 "Photo.c"
 }
 
 
@@ -32848,7 +32948,7 @@ 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 32847 "Photo.c"
+#line 32947 "Photo.c"
 }
 
 
@@ -32868,17 +32968,17 @@ 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 32867 "Photo.c"
+#line 32967 "Photo.c"
 	} else {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32871 "Photo.c"
+#line 32971 "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 32877 "Photo.c"
+#line 32977 "Photo.c"
 	}
 }
 
@@ -32897,17 +32997,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 32896 "Photo.c"
+#line 32996 "Photo.c"
 	} else {
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32900 "Photo.c"
+#line 33000 "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 32906 "Photo.c"
+#line 33006 "Photo.c"
 	}
 }
 
@@ -32917,14 +33017,14 @@ 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 32916 "Photo.c"
+#line 33016 "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 32923 "Photo.c"
+#line 33023 "Photo.c"
 }
 
 
@@ -32934,7 +33034,7 @@ static void photo_reimport_master_state_finalize (PhotoReimportMasterState* obj)
 	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 32933 "Photo.c"
+#line 33033 "Photo.c"
 }
 
 
@@ -32959,7 +33059,7 @@ gpointer photo_reimport_master_state_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 32958 "Photo.c"
+#line 33058 "Photo.c"
 }
 
 
@@ -32972,7 +33072,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 32971 "Photo.c"
+#line 33071 "Photo.c"
 	}
 }
 
@@ -32984,17 +33084,17 @@ 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 32983 "Photo.c"
+#line 33083 "Photo.c"
 		gchar* _tmp0_ = NULL;
 #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 32989 "Photo.c"
+#line 33089 "Photo.c"
 	}
 #line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 32993 "Photo.c"
+#line 33093 "Photo.c"
 }
 
 
@@ -33048,14 +33148,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 33047 "Photo.c"
+#line 33147 "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 33054 "Photo.c"
+#line 33154 "Photo.c"
 }
 
 
@@ -33064,7 +33164,7 @@ 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 33063 "Photo.c"
+#line 33163 "Photo.c"
 }
 
 
@@ -33076,7 +33176,7 @@ static void photo_reimport_master_state_impl_instance_init (PhotoReimportMasterS
 	self->row = _tmp0_;
 #line 1357 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata_only = FALSE;
-#line 33075 "Photo.c"
+#line 33175 "Photo.c"
 }
 
 
@@ -33092,7 +33192,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 33091 "Photo.c"
+#line 33191 "Photo.c"
 }
 
 
@@ -33114,14 +33214,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 33113 "Photo.c"
+#line 33213 "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 33120 "Photo.c"
+#line 33220 "Photo.c"
 }
 
 
@@ -33130,7 +33230,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 33129 "Photo.c"
+#line 33229 "Photo.c"
 	}
 }
 
@@ -33140,11 +33240,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 33139 "Photo.c"
+#line 33239 "Photo.c"
 	} else {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 33143 "Photo.c"
+#line 33243 "Photo.c"
 	}
 }
 
@@ -33152,37 +33252,37 @@ 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 33151 "Photo.c"
+#line 33251 "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 33158 "Photo.c"
+#line 33258 "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 33165 "Photo.c"
+#line 33265 "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 33169 "Photo.c"
+#line 33269 "Photo.c"
 		}
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_editable_state_ref (object);
-#line 33173 "Photo.c"
+#line 33273 "Photo.c"
 	} else {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33177 "Photo.c"
+#line 33277 "Photo.c"
 	}
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33181 "Photo.c"
+#line 33281 "Photo.c"
 }
 
 
@@ -33193,25 +33293,25 @@ static gchar* photo_value_reimport_editable_state_lcopy_value (const GValue* val
 	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 33192 "Photo.c"
+#line 33292 "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 33198 "Photo.c"
+#line 33298 "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 33202 "Photo.c"
+#line 33302 "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 33206 "Photo.c"
+#line 33306 "Photo.c"
 	}
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33210 "Photo.c"
+#line 33310 "Photo.c"
 }
 
 
@@ -33225,7 +33325,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 33224 "Photo.c"
+#line 33324 "Photo.c"
 }
 
 
@@ -33234,7 +33334,7 @@ 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 33233 "Photo.c"
+#line 33333 "Photo.c"
 }
 
 
@@ -33254,17 +33354,17 @@ 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 33253 "Photo.c"
+#line 33353 "Photo.c"
 	} else {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33257 "Photo.c"
+#line 33357 "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 33263 "Photo.c"
+#line 33363 "Photo.c"
 	}
 }
 
@@ -33283,17 +33383,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 33282 "Photo.c"
+#line 33382 "Photo.c"
 	} else {
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33286 "Photo.c"
+#line 33386 "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 33292 "Photo.c"
+#line 33392 "Photo.c"
 	}
 }
 
@@ -33303,14 +33403,14 @@ 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 33302 "Photo.c"
+#line 33402 "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 33309 "Photo.c"
+#line 33409 "Photo.c"
 }
 
 
@@ -33320,7 +33420,7 @@ static void photo_reimport_editable_state_finalize (PhotoReimportEditableState*
 	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 33319 "Photo.c"
+#line 33419 "Photo.c"
 }
 
 
@@ -33345,7 +33445,7 @@ gpointer photo_reimport_editable_state_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 33344 "Photo.c"
+#line 33444 "Photo.c"
 }
 
 
@@ -33358,7 +33458,7 @@ 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 33357 "Photo.c"
+#line 33457 "Photo.c"
 	}
 }
 
@@ -33393,14 +33493,14 @@ static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_constr
 	self->metadata = _tmp3_;
 #line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33392 "Photo.c"
+#line 33492 "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 33399 "Photo.c"
+#line 33499 "Photo.c"
 }
 
 
@@ -33409,7 +33509,7 @@ 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 33408 "Photo.c"
+#line 33508 "Photo.c"
 }
 
 
@@ -33421,7 +33521,7 @@ static void photo_reimport_editable_state_impl_instance_init (PhotoReimportEdita
 	self->backing_state = _tmp0_;
 #line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata_only = FALSE;
-#line 33420 "Photo.c"
+#line 33520 "Photo.c"
 }
 
 
@@ -33435,7 +33535,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 33434 "Photo.c"
+#line 33534 "Photo.c"
 }
 
 
@@ -33457,14 +33557,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 33456 "Photo.c"
+#line 33556 "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 33463 "Photo.c"
+#line 33563 "Photo.c"
 }
 
 
@@ -33473,7 +33573,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 33472 "Photo.c"
+#line 33572 "Photo.c"
 	}
 }
 
@@ -33483,11 +33583,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 33482 "Photo.c"
+#line 33582 "Photo.c"
 	} else {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 33486 "Photo.c"
+#line 33586 "Photo.c"
 	}
 }
 
@@ -33495,37 +33595,37 @@ 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 33494 "Photo.c"
+#line 33594 "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 33501 "Photo.c"
+#line 33601 "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 33508 "Photo.c"
+#line 33608 "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 33512 "Photo.c"
+#line 33612 "Photo.c"
 		}
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_raw_development_state_ref (object);
-#line 33516 "Photo.c"
+#line 33616 "Photo.c"
 	} else {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33520 "Photo.c"
+#line 33620 "Photo.c"
 	}
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33524 "Photo.c"
+#line 33624 "Photo.c"
 }
 
 
@@ -33536,25 +33636,25 @@ static gchar* photo_value_reimport_raw_development_state_lcopy_value (const GVal
 	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 33535 "Photo.c"
+#line 33635 "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 33541 "Photo.c"
+#line 33641 "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 33545 "Photo.c"
+#line 33645 "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 33549 "Photo.c"
+#line 33649 "Photo.c"
 	}
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33553 "Photo.c"
+#line 33653 "Photo.c"
 }
 
 
@@ -33568,7 +33668,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 33567 "Photo.c"
+#line 33667 "Photo.c"
 }
 
 
@@ -33577,7 +33677,7 @@ 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 33576 "Photo.c"
+#line 33676 "Photo.c"
 }
 
 
@@ -33597,17 +33697,17 @@ 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 33596 "Photo.c"
+#line 33696 "Photo.c"
 	} else {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33600 "Photo.c"
+#line 33700 "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 33606 "Photo.c"
+#line 33706 "Photo.c"
 	}
 }
 
@@ -33626,17 +33726,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 33625 "Photo.c"
+#line 33725 "Photo.c"
 	} else {
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33629 "Photo.c"
+#line 33729 "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 33635 "Photo.c"
+#line 33735 "Photo.c"
 	}
 }
 
@@ -33646,14 +33746,14 @@ 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 33645 "Photo.c"
+#line 33745 "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 33652 "Photo.c"
+#line 33752 "Photo.c"
 }
 
 
@@ -33663,7 +33763,7 @@ static void photo_reimport_raw_development_state_finalize (PhotoReimportRawDevel
 	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 33662 "Photo.c"
+#line 33762 "Photo.c"
 }
 
 
@@ -33688,7 +33788,7 @@ gpointer photo_reimport_raw_development_state_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 33687 "Photo.c"
+#line 33787 "Photo.c"
 }
 
 
@@ -33701,7 +33801,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 33700 "Photo.c"
+#line 33800 "Photo.c"
 	}
 }
 
@@ -33712,14 +33812,14 @@ 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 33711 "Photo.c"
+#line 33811 "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 33718 "Photo.c"
+#line 33818 "Photo.c"
 }
 
 
@@ -33749,7 +33849,7 @@ 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 33748 "Photo.c"
+#line 33848 "Photo.c"
 }
 
 
@@ -33770,7 +33870,7 @@ 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 33769 "Photo.c"
+#line 33869 "Photo.c"
 }
 
 
@@ -33804,21 +33904,21 @@ static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_dev
 	self->metadata = _tmp3_;
 #line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33803 "Photo.c"
+#line 33903 "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 33810 "Photo.c"
+#line 33910 "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 33817 "Photo.c"
+#line 33917 "Photo.c"
 }
 
 
@@ -33827,7 +33927,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 33826 "Photo.c"
+#line 33926 "Photo.c"
 	}
 }
 
@@ -33837,11 +33937,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 33836 "Photo.c"
+#line 33936 "Photo.c"
 	} else {
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 33840 "Photo.c"
+#line 33940 "Photo.c"
 	}
 }
 
@@ -33849,37 +33949,37 @@ 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 33848 "Photo.c"
+#line 33948 "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 33855 "Photo.c"
+#line 33955 "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 33862 "Photo.c"
+#line 33962 "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 33866 "Photo.c"
+#line 33966 "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 33870 "Photo.c"
+#line 33970 "Photo.c"
 	} else {
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33874 "Photo.c"
+#line 33974 "Photo.c"
 	}
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33878 "Photo.c"
+#line 33978 "Photo.c"
 }
 
 
@@ -33890,25 +33990,25 @@ static gchar* photo_reimport_raw_development_state_impl_value_dev_to_reimport_lc
 	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 33889 "Photo.c"
+#line 33989 "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 33895 "Photo.c"
+#line 33995 "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 33899 "Photo.c"
+#line 33999 "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 33903 "Photo.c"
+#line 34003 "Photo.c"
 	}
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33907 "Photo.c"
+#line 34007 "Photo.c"
 }
 
 
@@ -33922,7 +34022,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 33921 "Photo.c"
+#line 34021 "Photo.c"
 }
 
 
@@ -33931,7 +34031,7 @@ 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 33930 "Photo.c"
+#line 34030 "Photo.c"
 }
 
 
@@ -33951,17 +34051,17 @@ 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 33950 "Photo.c"
+#line 34050 "Photo.c"
 	} else {
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33954 "Photo.c"
+#line 34054 "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 33960 "Photo.c"
+#line 34060 "Photo.c"
 	}
 }
 
@@ -33980,17 +34080,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 33979 "Photo.c"
+#line 34079 "Photo.c"
 	} else {
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33983 "Photo.c"
+#line 34083 "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 33989 "Photo.c"
+#line 34089 "Photo.c"
 	}
 }
 
@@ -34000,7 +34100,7 @@ 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 33999 "Photo.c"
+#line 34099 "Photo.c"
 }
 
 
@@ -34012,7 +34112,7 @@ static void photo_reimport_raw_development_state_impl_dev_to_reimport_instance_i
 	self->backing = _tmp0_;
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 34011 "Photo.c"
+#line 34111 "Photo.c"
 }
 
 
@@ -34026,7 +34126,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 34025 "Photo.c"
+#line 34125 "Photo.c"
 }
 
 
@@ -34051,7 +34151,7 @@ static gpointer photo_reimport_raw_development_state_impl_dev_to_reimport_ref (g
 	g_atomic_int_inc (&self->ref_count);
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 34050 "Photo.c"
+#line 34150 "Photo.c"
 }
 
 
@@ -34064,7 +34164,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 34063 "Photo.c"
+#line 34163 "Photo.c"
 	}
 }
 
@@ -34074,19 +34174,19 @@ 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 34073 "Photo.c"
+#line 34173 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_instance_init (PhotoReimportRawDevelopmentStateImpl * self) {
 	GeeArrayList* _tmp0_ = NULL;
 #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, photo_reimport_raw_development_state_impl_dev_to_reimport_unref, NULL, NULL, NULL);
+	_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 34085 "Photo.c"
+#line 34185 "Photo.c"
 }
 
 
@@ -34098,7 +34198,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 34097 "Photo.c"
+#line 34197 "Photo.c"
 }
 
 
@@ -34120,91 +34220,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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -34241,7 +34341,7 @@ static void photo_class_init (PhotoClass * klass) {
 	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 34240 "Photo.c"
+#line 34340 "Photo.c"
 }
 
 
@@ -34252,7 +34352,7 @@ static void photo_dateable_interface_init (DateableIface * iface) {
 	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 34251 "Photo.c"
+#line 34351 "Photo.c"
 }
 
 
@@ -34295,7 +34395,7 @@ 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 34294 "Photo.c"
+#line 34394 "Photo.c"
 }
 
 
@@ -34335,7 +34435,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 34334 "Photo.c"
+#line 34434 "Photo.c"
 }
 
 
@@ -34358,13 +34458,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 34357 "Photo.c"
+#line 34457 "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 34363 "Photo.c"
+#line 34463 "Photo.c"
 	}
 }
 
@@ -34374,13 +34474,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 34373 "Photo.c"
+#line 34473 "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 34379 "Photo.c"
+#line 34479 "Photo.c"
 	}
 }
 
@@ -34402,7 +34502,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 34401 "Photo.c"
+#line 34501 "Photo.c"
 }
 
 
@@ -34411,7 +34511,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 34410 "Photo.c"
+#line 34510 "Photo.c"
 }
 
 
@@ -34420,7 +34520,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 34419 "Photo.c"
+#line 34519 "Photo.c"
 }
 
 
@@ -34432,7 +34532,7 @@ static gint64* _int64_dup (gint64* self) {
 	memcpy (dup, self, sizeof (gint64));
 #line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
 	return dup;
-#line 34431 "Photo.c"
+#line 34531 "Photo.c"
 }
 
 
@@ -34441,7 +34541,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 34440 "Photo.c"
+#line 34540 "Photo.c"
 }
 
 
@@ -34450,21 +34550,21 @@ 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 34449 "Photo.c"
+#line 34549 "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 34456 "Photo.c"
+#line 34556 "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 34463 "Photo.c"
+#line 34563 "Photo.c"
 }
 
 
@@ -34494,14 +34594,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 34493 "Photo.c"
+#line 34593 "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 34500 "Photo.c"
+#line 34600 "Photo.c"
 }
 
 
@@ -34510,7 +34610,7 @@ 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 34509 "Photo.c"
+#line 34609 "Photo.c"
 }
 
 
@@ -34526,7 +34626,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 34525 "Photo.c"
+#line 34625 "Photo.c"
 }
 
 
@@ -34535,7 +34635,7 @@ 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 34534 "Photo.c"
+#line 34634 "Photo.c"
 }
 
 
@@ -34551,7 +34651,7 @@ 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 34550 "Photo.c"
+#line 34650 "Photo.c"
 }
 
 
@@ -34577,7 +34677,7 @@ 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 34576 "Photo.c"
+#line 34676 "Photo.c"
 }
 
 
@@ -34595,7 +34695,7 @@ 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 34594 "Photo.c"
+#line 34694 "Photo.c"
 }
 
 
@@ -34611,7 +34711,7 @@ static gchar* library_photo_source_collection_real_get_typename (MediaSourceColl
 	result = _tmp0_;
 #line 4513 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34610 "Photo.c"
+#line 34710 "Photo.c"
 }
 
 
@@ -34632,21 +34732,21 @@ 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 34631 "Photo.c"
+#line 34731 "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 34638 "Photo.c"
+#line 34738 "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 34645 "Photo.c"
+#line 34745 "Photo.c"
 }
 
 
@@ -34666,7 +34766,7 @@ 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 34665 "Photo.c"
+#line 34765 "Photo.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp1_ = NULL;
@@ -34679,7 +34779,7 @@ 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 34678 "Photo.c"
+#line 34778 "Photo.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				DataObject* object = NULL;
@@ -34729,7 +34829,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 34728 "Photo.c"
+#line 34828 "Photo.c"
 				}
 #line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _object_it;
@@ -34753,7 +34853,7 @@ 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 34752 "Photo.c"
+#line 34852 "Photo.c"
 					GeeHashMap* _tmp12_ = NULL;
 					GFile* _tmp13_ = NULL;
 					LibraryPhoto* _tmp14_ = NULL;
@@ -34765,7 +34865,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 34764 "Photo.c"
+#line 34864 "Photo.c"
 				}
 #line 4529 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = photo;
@@ -34781,7 +34881,7 @@ 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 34780 "Photo.c"
+#line 34880 "Photo.c"
 					{
 						GeeIterator* _f_it = NULL;
 						GeeCollection* _tmp19_ = NULL;
@@ -34794,7 +34894,7 @@ 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 34793 "Photo.c"
+#line 34893 "Photo.c"
 							GeeIterator* _tmp21_ = NULL;
 							gboolean _tmp22_ = FALSE;
 							GFile* f = NULL;
@@ -34811,7 +34911,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 34810 "Photo.c"
+#line 34910 "Photo.c"
 							}
 #line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp23_ = _f_it;
@@ -34829,11 +34929,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 34828 "Photo.c"
+#line 34928 "Photo.c"
 						}
 #line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_f_it);
-#line 34832 "Photo.c"
+#line 34932 "Photo.c"
 					}
 				}
 #line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34866,7 +34966,7 @@ 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 34865 "Photo.c"
+#line 34965 "Photo.c"
 					LibraryPhoto* _tmp39_ = NULL;
 					BackingPhotoRow* _tmp40_ = NULL;
 					BackingPhotoRow* _tmp41_ = NULL;
@@ -34883,11 +34983,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 34882 "Photo.c"
+#line 34982 "Photo.c"
 				} else {
 #line 4540 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp34_ = (gint64) -1;
-#line 34886 "Photo.c"
+#line 34986 "Photo.c"
 				}
 #line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_filesize = _tmp34_;
@@ -34911,7 +35011,7 @@ 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 34910 "Photo.c"
+#line 35010 "Photo.c"
 					GeeMultiMap* _tmp50_ = NULL;
 					gint64 _tmp51_ = 0LL;
 					LibraryPhoto* _tmp52_ = NULL;
@@ -34934,7 +35034,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 34933 "Photo.c"
+#line 35033 "Photo.c"
 				}
 #line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp56_ = photo;
@@ -34946,7 +35046,7 @@ 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 34945 "Photo.c"
+#line 35045 "Photo.c"
 					{
 						GeeIterator* _row_it = NULL;
 						GeeCollection* _tmp59_ = NULL;
@@ -34959,7 +35059,7 @@ 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 34958 "Photo.c"
+#line 35058 "Photo.c"
 							GeeIterator* _tmp61_ = NULL;
 							gboolean _tmp62_ = FALSE;
 							BackingPhotoRow* row = NULL;
@@ -34975,7 +35075,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 34974 "Photo.c"
+#line 35074 "Photo.c"
 							}
 #line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp63_ = _row_it;
@@ -34989,7 +35089,7 @@ 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 34988 "Photo.c"
+#line 35088 "Photo.c"
 								GeeMultiMap* _tmp67_ = NULL;
 								BackingPhotoRow* _tmp68_ = NULL;
 								gint64 _tmp69_ = 0LL;
@@ -35018,15 +35118,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 35017 "Photo.c"
+#line 35117 "Photo.c"
 							}
 #line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (row);
-#line 35021 "Photo.c"
+#line 35121 "Photo.c"
 						}
 #line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_row_it);
-#line 35025 "Photo.c"
+#line 35125 "Photo.c"
 					}
 				}
 #line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35039,18 +35139,18 @@ 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 35038 "Photo.c"
+#line 35138 "Photo.c"
 			}
 #line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_object_it);
-#line 35042 "Photo.c"
+#line 35142 "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 35049 "Photo.c"
+#line 35149 "Photo.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp76_ = NULL;
@@ -35063,7 +35163,7 @@ 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 35062 "Photo.c"
+#line 35162 "Photo.c"
 				GeeIterator* _tmp78_ = NULL;
 				gboolean _tmp79_ = FALSE;
 				DataObject* object = NULL;
@@ -35114,7 +35214,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 35113 "Photo.c"
+#line 35213 "Photo.c"
 				}
 #line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp80_ = _object_it;
@@ -35138,7 +35238,7 @@ 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 35137 "Photo.c"
+#line 35237 "Photo.c"
 					gboolean is_removed = FALSE;
 					GeeHashMap* _tmp87_ = NULL;
 					LibraryPhoto* _tmp88_ = NULL;
@@ -35167,7 +35267,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 35166 "Photo.c"
+#line 35266 "Photo.c"
 				}
 #line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp94_ = photo;
@@ -35185,7 +35285,7 @@ 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 35184 "Photo.c"
+#line 35284 "Photo.c"
 					{
 						GeeIterator* _f_it = NULL;
 						GeeCollection* _tmp99_ = NULL;
@@ -35198,7 +35298,7 @@ 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 35197 "Photo.c"
+#line 35297 "Photo.c"
 							GeeIterator* _tmp101_ = NULL;
 							gboolean _tmp102_ = FALSE;
 							GFile* f = NULL;
@@ -35214,7 +35314,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 35213 "Photo.c"
+#line 35313 "Photo.c"
 							}
 #line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp103_ = _f_it;
@@ -35230,11 +35330,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 35229 "Photo.c"
+#line 35329 "Photo.c"
 						}
 #line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_f_it);
-#line 35233 "Photo.c"
+#line 35333 "Photo.c"
 					}
 				}
 #line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35269,7 +35369,7 @@ 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 35268 "Photo.c"
+#line 35368 "Photo.c"
 					LibraryPhoto* _tmp119_ = NULL;
 					BackingPhotoRow* _tmp120_ = NULL;
 					BackingPhotoRow* _tmp121_ = NULL;
@@ -35286,11 +35386,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 35285 "Photo.c"
+#line 35385 "Photo.c"
 				} else {
 #line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp114_ = (gint64) -1;
-#line 35289 "Photo.c"
+#line 35389 "Photo.c"
 				}
 #line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_filesize = _tmp114_;
@@ -35312,7 +35412,7 @@ 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 35311 "Photo.c"
+#line 35411 "Photo.c"
 					GeeMultiMap* _tmp129_ = NULL;
 					gint64 _tmp130_ = 0LL;
 					LibraryPhoto* _tmp131_ = NULL;
@@ -35332,7 +35432,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 35331 "Photo.c"
+#line 35431 "Photo.c"
 				}
 #line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp134_ = photo;
@@ -35344,7 +35444,7 @@ 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 35343 "Photo.c"
+#line 35443 "Photo.c"
 					{
 						GeeIterator* _row_it = NULL;
 						GeeCollection* _tmp137_ = NULL;
@@ -35357,7 +35457,7 @@ 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 35356 "Photo.c"
+#line 35456 "Photo.c"
 							GeeIterator* _tmp139_ = NULL;
 							gboolean _tmp140_ = FALSE;
 							BackingPhotoRow* row = NULL;
@@ -35373,7 +35473,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 35372 "Photo.c"
+#line 35472 "Photo.c"
 							}
 #line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp141_ = _row_it;
@@ -35387,7 +35487,7 @@ 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 35386 "Photo.c"
+#line 35486 "Photo.c"
 								GeeMultiMap* _tmp145_ = NULL;
 								BackingPhotoRow* _tmp146_ = NULL;
 								gint64 _tmp147_ = 0LL;
@@ -35416,15 +35516,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 35415 "Photo.c"
+#line 35515 "Photo.c"
 							}
 #line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (row);
-#line 35419 "Photo.c"
+#line 35519 "Photo.c"
 						}
 #line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_row_it);
-#line 35423 "Photo.c"
+#line 35523 "Photo.c"
 					}
 				}
 #line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35437,11 +35537,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 35436 "Photo.c"
+#line 35536 "Photo.c"
 			}
 #line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_object_it);
-#line 35440 "Photo.c"
+#line 35540 "Photo.c"
 		}
 	}
 #line 4600 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35450,7 +35550,7 @@ 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 35449 "Photo.c"
+#line 35549 "Photo.c"
 }
 
 
@@ -35469,7 +35569,7 @@ 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 35468 "Photo.c"
+#line 35568 "Photo.c"
 		gboolean is_removed = FALSE;
 		GeeHashMap* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
@@ -35487,13 +35587,13 @@ 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 35486 "Photo.c"
+#line 35586 "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 35492 "Photo.c"
+#line 35592 "Photo.c"
 		GeeHashMap* _tmp6_ = NULL;
 		GFile* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
@@ -35505,7 +35605,7 @@ 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 35504 "Photo.c"
+#line 35604 "Photo.c"
 	}
 }
 
@@ -35544,7 +35644,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 35543 "Photo.c"
+#line 35643 "Photo.c"
 	}
 #line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = self->priv->photo_to_raw_development_filesize;
@@ -35554,7 +35654,7 @@ 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 35553 "Photo.c"
+#line 35653 "Photo.c"
 		GeeMultiMap* _tmp21_ = NULL;
 		LibraryPhoto* _tmp22_ = NULL;
 		{
@@ -35583,7 +35683,7 @@ 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 35582 "Photo.c"
+#line 35682 "Photo.c"
 				GeeIterator* _tmp12_ = NULL;
 				gboolean _tmp13_ = FALSE;
 				gint64 s = 0LL;
@@ -35602,7 +35702,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 35601 "Photo.c"
+#line 35701 "Photo.c"
 				}
 #line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = _s_it;
@@ -35624,11 +35724,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 35623 "Photo.c"
+#line 35723 "Photo.c"
 			}
 #line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_s_it);
-#line 35627 "Photo.c"
+#line 35727 "Photo.c"
 		}
 #line 4622 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = self->priv->photo_to_raw_development_filesize;
@@ -35636,7 +35736,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 35635 "Photo.c"
+#line 35735 "Photo.c"
 	}
 #line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = photo;
@@ -35648,7 +35748,7 @@ 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 35647 "Photo.c"
+#line 35747 "Photo.c"
 		{
 			GeeIterator* _f_it = NULL;
 			GeeCollection* _tmp26_ = NULL;
@@ -35661,7 +35761,7 @@ 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 35660 "Photo.c"
+#line 35760 "Photo.c"
 				GeeIterator* _tmp28_ = NULL;
 				gboolean _tmp29_ = FALSE;
 				GFile* f = NULL;
@@ -35678,7 +35778,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 35677 "Photo.c"
+#line 35777 "Photo.c"
 				}
 #line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = _f_it;
@@ -35696,11 +35796,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 35695 "Photo.c"
+#line 35795 "Photo.c"
 			}
 #line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_f_it);
-#line 35699 "Photo.c"
+#line 35799 "Photo.c"
 		}
 	}
 #line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35713,7 +35813,7 @@ 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 35712 "Photo.c"
+#line 35812 "Photo.c"
 		{
 			GeeIterator* _row_it = NULL;
 			GeeCollection* _tmp38_ = NULL;
@@ -35726,7 +35826,7 @@ 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 35725 "Photo.c"
+#line 35825 "Photo.c"
 				GeeIterator* _tmp40_ = NULL;
 				gboolean _tmp41_ = FALSE;
 				BackingPhotoRow* row = NULL;
@@ -35742,7 +35842,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 35741 "Photo.c"
+#line 35841 "Photo.c"
 				}
 #line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp42_ = _row_it;
@@ -35756,7 +35856,7 @@ 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 35755 "Photo.c"
+#line 35855 "Photo.c"
 					GeeMultiMap* _tmp46_ = NULL;
 					BackingPhotoRow* _tmp47_ = NULL;
 					gint64 _tmp48_ = 0LL;
@@ -35785,15 +35885,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 35784 "Photo.c"
+#line 35884 "Photo.c"
 				}
 #line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (row);
-#line 35788 "Photo.c"
+#line 35888 "Photo.c"
 			}
 #line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_row_it);
-#line 35792 "Photo.c"
+#line 35892 "Photo.c"
 		}
 	}
 #line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35802,14 +35902,14 @@ 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 35801 "Photo.c"
+#line 35901 "Photo.c"
 }
 
 
 static gpointer __int64_dup0 (gpointer self) {
 #line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? _int64_dup (self) : NULL;
-#line 35808 "Photo.c"
+#line 35908 "Photo.c"
 }
 
 
@@ -35820,7 +35920,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 	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 35819 "Photo.c"
+#line 35919 "Photo.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -35847,7 +35947,7 @@ 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 35846 "Photo.c"
+#line 35946 "Photo.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			DataObject* object = NULL;
@@ -35871,7 +35971,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 			if (!_tmp7_) {
 #line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 35870 "Photo.c"
+#line 35970 "Photo.c"
 			}
 #line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _object_it;
@@ -35901,7 +36001,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 			if (_tmp17_) {
 #line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = TRUE;
-#line 35900 "Photo.c"
+#line 36000 "Photo.c"
 			} else {
 				Alteration* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
@@ -35911,11 +36011,11 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 				_tmp19_ = alteration_has_detail (_tmp18_, "image", "editable");
 #line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = _tmp19_;
-#line 35910 "Photo.c"
+#line 36010 "Photo.c"
 			}
 #line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp15_) {
-#line 35914 "Photo.c"
+#line 36014 "Photo.c"
 				gint64 old_master_filesize = 0LL;
 				GeeHashMap* _tmp20_ = NULL;
 				LibraryPhoto* _tmp21_ = NULL;
@@ -35974,7 +36074,7 @@ 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 35973 "Photo.c"
+#line 36073 "Photo.c"
 					GeeHashMap* _tmp29_ = NULL;
 					LibraryPhoto* _tmp30_ = NULL;
 					gpointer _tmp31_ = NULL;
@@ -35988,7 +36088,7 @@ 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 35987 "Photo.c"
+#line 36087 "Photo.c"
 				} else {
 					gint64 _tmp32_ = 0LL;
 					gint64* _tmp33_ = NULL;
@@ -36000,7 +36100,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 35999 "Photo.c"
+#line 36099 "Photo.c"
 				}
 #line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
 				old_editable_filesize = *_tmp25_;
@@ -36022,7 +36122,7 @@ 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 36021 "Photo.c"
+#line 36121 "Photo.c"
 					GeeHashMap* _tmp40_ = NULL;
 					LibraryPhoto* _tmp41_ = NULL;
 					GeeMultiMap* _tmp42_ = NULL;
@@ -36042,7 +36142,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 36041 "Photo.c"
+#line 36141 "Photo.c"
 				}
 #line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = photo;
@@ -36070,7 +36170,7 @@ 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 36069 "Photo.c"
+#line 36169 "Photo.c"
 					LibraryPhoto* _tmp55_ = NULL;
 					BackingPhotoRow* _tmp56_ = NULL;
 					BackingPhotoRow* _tmp57_ = NULL;
@@ -36087,11 +36187,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 36086 "Photo.c"
+#line 36186 "Photo.c"
 				} else {
 #line 4664 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp50_ = (gint64) -1;
-#line 36090 "Photo.c"
+#line 36190 "Photo.c"
 				}
 #line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_filesize = _tmp50_;
@@ -36115,7 +36215,7 @@ 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 36114 "Photo.c"
+#line 36214 "Photo.c"
 					GeeHashMap* _tmp66_ = NULL;
 					LibraryPhoto* _tmp67_ = NULL;
 					gint64 _tmp68_ = 0LL;
@@ -36138,11 +36238,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 36137 "Photo.c"
+#line 36237 "Photo.c"
 				}
 #line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp25_);
-#line 36141 "Photo.c"
+#line 36241 "Photo.c"
 			}
 #line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
@@ -36150,17 +36250,17 @@ 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 36149 "Photo.c"
+#line 36249 "Photo.c"
 		}
 #line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_object_it);
-#line 36153 "Photo.c"
+#line 36253 "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 36159 "Photo.c"
+#line 36259 "Photo.c"
 }
 
 
@@ -36174,10 +36274,10 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 #line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media_sources));
 #line 4679 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp0_ = gee_hash_multi_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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 36176 "Photo.c"
+#line 36276 "Photo.c"
 	{
 		GeeIterator* _media_it = NULL;
 		GeeCollection* _tmp1_ = NULL;
@@ -36190,7 +36290,7 @@ 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 36189 "Photo.c"
+#line 36289 "Photo.c"
 			GeeIterator* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
 			MediaSource* media = NULL;
@@ -36221,7 +36321,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 36220 "Photo.c"
+#line 36320 "Photo.c"
 			}
 #line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _media_it;
@@ -36253,7 +36353,7 @@ 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 36252 "Photo.c"
+#line 36352 "Photo.c"
 				PhotoMetadata* _tmp14_ = NULL;
 				GeeSet* _tmp15_ = NULL;
 				GeeSet* _tmp16_ = NULL;
@@ -36272,7 +36372,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 36271 "Photo.c"
+#line 36371 "Photo.c"
 			}
 #line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = photo;
@@ -36286,7 +36386,7 @@ 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 36285 "Photo.c"
+#line 36385 "Photo.c"
 				{
 					GeeIterator* _keyword_it = NULL;
 					LibraryPhoto* _tmp22_ = NULL;
@@ -36310,7 +36410,7 @@ 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 36309 "Photo.c"
+#line 36409 "Photo.c"
 						GeeIterator* _tmp27_ = NULL;
 						gboolean _tmp28_ = FALSE;
 						gchar* keyword = NULL;
@@ -36333,7 +36433,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 36332 "Photo.c"
+#line 36432 "Photo.c"
 						}
 #line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp29_ = _keyword_it;
@@ -36345,7 +36445,7 @@ 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 36344 "Photo.c"
+#line 36444 "Photo.c"
 							HierarchicalTagIndex* _tmp33_ = NULL;
 							const gchar* _tmp34_ = NULL;
 							gboolean _tmp35_ = FALSE;
@@ -36357,11 +36457,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 36356 "Photo.c"
+#line 36456 "Photo.c"
 						} else {
 #line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp31_ = FALSE;
-#line 36360 "Photo.c"
+#line 36460 "Photo.c"
 						}
 #line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp31_) {
@@ -36369,7 +36469,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 36368 "Photo.c"
+#line 36468 "Photo.c"
 						}
 #line 4703 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp36_ = keyword;
@@ -36385,7 +36485,7 @@ 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 36384 "Photo.c"
+#line 36484 "Photo.c"
 							gchar* most_derived_path = NULL;
 							HierarchicalTagIndex* _tmp41_ = NULL;
 							const gchar* _tmp42_ = NULL;
@@ -36425,13 +36525,13 @@ 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 36424 "Photo.c"
+#line 36524 "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 36430 "Photo.c"
+#line 36530 "Photo.c"
 							GeeHashMultiMap* _tmp50_ = NULL;
 							const gchar* _tmp51_ = NULL;
 							Tag* _tmp52_ = NULL;
@@ -36451,17 +36551,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 36450 "Photo.c"
+#line 36550 "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 36456 "Photo.c"
+#line 36556 "Photo.c"
 					}
 #line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_keyword_it);
-#line 36460 "Photo.c"
+#line 36560 "Photo.c"
 				}
 			}
 #line 4716 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36470,7 +36570,7 @@ 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 36469 "Photo.c"
+#line 36569 "Photo.c"
 				{
 					GeeIterator* _path_it = NULL;
 					HierarchicalTagIndex* _tmp57_ = NULL;
@@ -36494,7 +36594,7 @@ 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 36493 "Photo.c"
+#line 36593 "Photo.c"
 						GeeIterator* _tmp62_ = NULL;
 						gboolean _tmp63_ = FALSE;
 						gchar* path = NULL;
@@ -36512,7 +36612,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 36511 "Photo.c"
+#line 36611 "Photo.c"
 						}
 #line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp64_ = _path_it;
@@ -36530,7 +36630,7 @@ 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 36529 "Photo.c"
+#line 36629 "Photo.c"
 							GeeHashMultiMap* _tmp69_ = NULL;
 							const gchar* _tmp70_ = NULL;
 							Tag* _tmp71_ = NULL;
@@ -36550,17 +36650,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 36549 "Photo.c"
+#line 36649 "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 36555 "Photo.c"
+#line 36655 "Photo.c"
 					}
 #line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_path_it);
-#line 36559 "Photo.c"
+#line 36659 "Photo.c"
 				}
 			}
 #line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36573,11 +36673,11 @@ 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 36572 "Photo.c"
+#line 36672 "Photo.c"
 		}
 #line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_media_it);
-#line 36576 "Photo.c"
+#line 36676 "Photo.c"
 	}
 	{
 		GeeIterator* _media_it = NULL;
@@ -36591,7 +36691,7 @@ 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 36590 "Photo.c"
+#line 36690 "Photo.c"
 			GeeIterator* _tmp76_ = NULL;
 			gboolean _tmp77_ = FALSE;
 			MediaSource* media = NULL;
@@ -36609,7 +36709,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 36608 "Photo.c"
+#line 36708 "Photo.c"
 			}
 #line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp78_ = _media_it;
@@ -36631,11 +36731,11 @@ 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 36630 "Photo.c"
+#line 36730 "Photo.c"
 		}
 #line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_media_it);
-#line 36634 "Photo.c"
+#line 36734 "Photo.c"
 	}
 	{
 		GeeIterator* _tag_it = NULL;
@@ -36660,7 +36760,7 @@ 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 36659 "Photo.c"
+#line 36759 "Photo.c"
 			GeeIterator* _tmp88_ = NULL;
 			gboolean _tmp89_ = FALSE;
 			Tag* tag = NULL;
@@ -36679,7 +36779,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 36678 "Photo.c"
+#line 36778 "Photo.c"
 			}
 #line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp90_ = _tag_it;
@@ -36703,11 +36803,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 36702 "Photo.c"
+#line 36802 "Photo.c"
 		}
 #line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tag_it);
-#line 36706 "Photo.c"
+#line 36806 "Photo.c"
 	}
 #line 4733 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp97_ = media_sources;
@@ -36715,7 +36815,7 @@ 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 36714 "Photo.c"
+#line 36814 "Photo.c"
 }
 
 
@@ -36732,7 +36832,7 @@ static void library_photo_source_collection_real_notify_master_reimported (Libra
 	_tmp1_ = metadata;
 #line 4738 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "master-reimported", _tmp0_, _tmp1_);
-#line 36731 "Photo.c"
+#line 36831 "Photo.c"
 }
 
 
@@ -36741,7 +36841,7 @@ 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 36740 "Photo.c"
+#line 36840 "Photo.c"
 }
 
 
@@ -36758,7 +36858,7 @@ static void library_photo_source_collection_real_notify_editable_reimported (Lib
 	_tmp1_ = metadata;
 #line 4743 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "editable-reimported", _tmp0_, _tmp1_);
-#line 36757 "Photo.c"
+#line 36857 "Photo.c"
 }
 
 
@@ -36767,7 +36867,7 @@ 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 36766 "Photo.c"
+#line 36866 "Photo.c"
 }
 
 
@@ -36784,7 +36884,7 @@ static void library_photo_source_collection_real_notify_source_reimported (Libra
 	_tmp1_ = metadata;
 #line 4748 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "source-reimported", _tmp0_, _tmp1_);
-#line 36783 "Photo.c"
+#line 36883 "Photo.c"
 }
 
 
@@ -36793,7 +36893,7 @@ 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 36792 "Photo.c"
+#line 36892 "Photo.c"
 }
 
 
@@ -36810,7 +36910,7 @@ static void library_photo_source_collection_real_notify_baseline_reimported (Lib
 	_tmp1_ = metadata;
 #line 4753 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "baseline-reimported", _tmp0_, _tmp1_);
-#line 36809 "Photo.c"
+#line 36909 "Photo.c"
 }
 
 
@@ -36819,7 +36919,7 @@ 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 36818 "Photo.c"
+#line 36918 "Photo.c"
 }
 
 
@@ -36841,7 +36941,7 @@ 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 36840 "Photo.c"
+#line 36940 "Photo.c"
 }
 
 
@@ -36860,7 +36960,7 @@ 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 36859 "Photo.c"
+#line 36959 "Photo.c"
 }
 
 
@@ -36882,7 +36982,7 @@ 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 36881 "Photo.c"
+#line 36981 "Photo.c"
 }
 
 
@@ -36901,7 +37001,7 @@ 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 36900 "Photo.c"
+#line 37000 "Photo.c"
 }
 
 
@@ -36923,7 +37023,7 @@ 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 36922 "Photo.c"
+#line 37022 "Photo.c"
 }
 
 
@@ -36946,7 +37046,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 36945 "Photo.c"
+#line 37045 "Photo.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -36954,7 +37054,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 36953 "Photo.c"
+#line 37053 "Photo.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -36966,7 +37066,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 36965 "Photo.c"
+#line 37065 "Photo.c"
 	}
 }
 
@@ -36990,21 +37090,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 36989 "Photo.c"
+#line 37089 "Photo.c"
 		glong _tmp2_ = 0L;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 36995 "Photo.c"
+#line 37095 "Photo.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 36999 "Photo.c"
+#line 37099 "Photo.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 37003 "Photo.c"
+#line 37103 "Photo.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -37016,7 +37116,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 37015 "Photo.c"
+#line 37115 "Photo.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -37026,13 +37126,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 37025 "Photo.c"
+#line 37125 "Photo.c"
 	}
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 37031 "Photo.c"
+#line 37131 "Photo.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -37046,7 +37146,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 37045 "Photo.c"
+#line 37145 "Photo.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -37056,13 +37156,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 37055 "Photo.c"
+#line 37155 "Photo.c"
 	}
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 37061 "Photo.c"
+#line 37161 "Photo.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -37071,7 +37171,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 37070 "Photo.c"
+#line 37170 "Photo.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -37091,7 +37191,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 37090 "Photo.c"
+#line 37190 "Photo.c"
 }
 
 
@@ -37137,7 +37237,7 @@ 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 37136 "Photo.c"
+#line 37236 "Photo.c"
 }
 
 
@@ -37169,7 +37269,7 @@ 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 37168 "Photo.c"
+#line 37268 "Photo.c"
 }
 
 
@@ -37192,7 +37292,7 @@ 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 37191 "Photo.c"
+#line 37291 "Photo.c"
 }
 
 
@@ -37215,7 +37315,7 @@ 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 37214 "Photo.c"
+#line 37314 "Photo.c"
 }
 
 
@@ -37238,7 +37338,7 @@ 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 37237 "Photo.c"
+#line 37337 "Photo.c"
 }
 
 
@@ -37286,7 +37386,7 @@ 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 37285 "Photo.c"
+#line 37385 "Photo.c"
 		GeeCollection* _tmp6_ = NULL;
 		LibraryPhoto* _tmp7_ = NULL;
 #line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37295,7 +37395,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 		_tmp7_ = photo;
 #line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_collection_add (_tmp6_, _tmp7_);
-#line 37294 "Photo.c"
+#line 37394 "Photo.c"
 	}
 #line 4809 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = photo;
@@ -37307,7 +37407,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 	_tmp11_ = editable;
 #line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_ != NULL) {
-#line 37306 "Photo.c"
+#line 37406 "Photo.c"
 		BackingPhotoRow* _tmp12_ = NULL;
 		GFileInfo* _tmp13_ = NULL;
 		gboolean _tmp14_ = FALSE;
@@ -37319,15 +37419,15 @@ 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 37318 "Photo.c"
+#line 37418 "Photo.c"
 	} else {
 #line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = FALSE;
-#line 37322 "Photo.c"
+#line 37422 "Photo.c"
 	}
 #line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_) {
-#line 37326 "Photo.c"
+#line 37426 "Photo.c"
 		GeeCollection* _tmp15_ = NULL;
 		LibraryPhoto* _tmp16_ = NULL;
 #line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37336,7 +37436,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 		_tmp16_ = photo;
 #line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_collection_add (_tmp15_, _tmp16_);
-#line 37335 "Photo.c"
+#line 37435 "Photo.c"
 	}
 #line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = photo;
@@ -37348,7 +37448,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 	_tmp19_ = development;
 #line 4814 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp19_ != NULL) {
-#line 37347 "Photo.c"
+#line 37447 "Photo.c"
 		{
 			GeeIterator* _row_it = NULL;
 			GeeCollection* _tmp20_ = NULL;
@@ -37361,7 +37461,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 			_row_it = _tmp21_;
 #line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 37360 "Photo.c"
+#line 37460 "Photo.c"
 				GeeIterator* _tmp22_ = NULL;
 				gboolean _tmp23_ = FALSE;
 				BackingPhotoRow* row = NULL;
@@ -37378,7 +37478,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 				if (!_tmp23_) {
 #line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 37377 "Photo.c"
+#line 37477 "Photo.c"
 				}
 #line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = _row_it;
@@ -37394,7 +37494,7 @@ 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 37393 "Photo.c"
+#line 37493 "Photo.c"
 					GeeCollection* _tmp29_ = NULL;
 					LibraryPhoto* _tmp30_ = NULL;
 #line 4817 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37407,22 +37507,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 37406 "Photo.c"
+#line 37506 "Photo.c"
 				}
 #line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (row);
-#line 37410 "Photo.c"
+#line 37510 "Photo.c"
 			}
 #line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_row_it);
-#line 37414 "Photo.c"
+#line 37514 "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 37421 "Photo.c"
+#line 37521 "Photo.c"
 }
 
 
@@ -37437,7 +37537,7 @@ 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 37436 "Photo.c"
+#line 37536 "Photo.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeMultiMap* _tmp0_ = NULL;
@@ -37467,7 +37567,7 @@ 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 37466 "Photo.c"
+#line 37566 "Photo.c"
 			GeeIterator* _tmp7_ = NULL;
 			gboolean _tmp8_ = FALSE;
 			LibraryPhoto* photo = NULL;
@@ -37486,7 +37586,7 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 			if (!_tmp8_) {
 #line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 37485 "Photo.c"
+#line 37585 "Photo.c"
 			}
 #line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _photo_it;
@@ -37508,11 +37608,11 @@ 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 37507 "Photo.c"
+#line 37607 "Photo.c"
 		}
 #line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_photo_it);
-#line 37511 "Photo.c"
+#line 37611 "Photo.c"
 	}
 	{
 		GeeIterator* _media_it = NULL;
@@ -37534,7 +37634,7 @@ 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 37533 "Photo.c"
+#line 37633 "Photo.c"
 			GeeIterator* _tmp20_ = NULL;
 			gboolean _tmp21_ = FALSE;
 			MediaSource* media = NULL;
@@ -37553,7 +37653,7 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 			if (!_tmp21_) {
 #line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 37552 "Photo.c"
+#line 37652 "Photo.c"
 			}
 #line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = _media_it;
@@ -37575,11 +37675,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 37574 "Photo.c"
+#line 37674 "Photo.c"
 		}
 #line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_media_it);
-#line 37578 "Photo.c"
+#line 37678 "Photo.c"
 	}
 }
 
@@ -37590,7 +37690,7 @@ 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 37589 "Photo.c"
+#line 37689 "Photo.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeMultiMap* _tmp0_ = NULL;
@@ -37617,7 +37717,7 @@ 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 37616 "Photo.c"
+#line 37716 "Photo.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			LibraryPhoto* photo = NULL;
@@ -37638,7 +37738,7 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
 			if (!_tmp7_) {
 #line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 37637 "Photo.c"
+#line 37737 "Photo.c"
 			}
 #line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _photo_it;
@@ -37664,7 +37764,7 @@ 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 37663 "Photo.c"
+#line 37763 "Photo.c"
 				LibraryPhoto* _tmp17_ = NULL;
 				PhotoID _tmp18_ = {0};
 #line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37679,15 +37779,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 37678 "Photo.c"
+#line 37778 "Photo.c"
 			}
 #line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 37682 "Photo.c"
+#line 37782 "Photo.c"
 		}
 #line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_photo_it);
-#line 37686 "Photo.c"
+#line 37786 "Photo.c"
 	}
 #line 4842 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id_init (&_tmp19_, PHOTO_ID_INVALID);
@@ -37695,7 +37795,7 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
 	*result = _tmp19_;
 #line 4842 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 37694 "Photo.c"
+#line 37794 "Photo.c"
 }
 
 
@@ -37721,7 +37821,7 @@ gboolean library_photo_source_collection_has_basename_filesize_duplicate (Librar
 	result = _tmp3_;
 #line 4847 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37720 "Photo.c"
+#line 37820 "Photo.c"
 }
 
 
@@ -37756,7 +37856,7 @@ 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 37755 "Photo.c"
+#line 37855 "Photo.c"
 		MediaSourceHoldingTank* _tmp6_ = NULL;
 		LibraryPhotoSourceHoldingTank* _tmp7_ = NULL;
 		GFile* _tmp8_ = NULL;
@@ -37775,13 +37875,13 @@ 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 37774 "Photo.c"
+#line 37874 "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 37780 "Photo.c"
+#line 37880 "Photo.c"
 }
 
 
@@ -37812,7 +37912,7 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSo
 	result = _tmp4_;
 #line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37811 "Photo.c"
+#line 37911 "Photo.c"
 }
 
 
@@ -37847,7 +37947,7 @@ 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 37846 "Photo.c"
+#line 37946 "Photo.c"
 		MediaSourceHoldingTank* _tmp6_ = NULL;
 		LibraryPhotoSourceHoldingTank* _tmp7_ = NULL;
 		GFile* _tmp8_ = NULL;
@@ -37866,13 +37966,13 @@ 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 37865 "Photo.c"
+#line 37965 "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 37871 "Photo.c"
+#line 37971 "Photo.c"
 }
 
 
@@ -37903,7 +38003,7 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSo
 	result = _tmp4_;
 #line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37902 "Photo.c"
+#line 38002 "Photo.c"
 }
 
 
@@ -37929,7 +38029,7 @@ gint library_photo_source_collection_get_offline_count (LibraryPhotoSourceCollec
 	result = _tmp3_;
 #line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37928 "Photo.c"
+#line 38028 "Photo.c"
 }
 
 
@@ -37976,11 +38076,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 37975 "Photo.c"
+#line 38075 "Photo.c"
 		}
 #line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 37979 "Photo.c"
+#line 38079 "Photo.c"
 	}
 #line 4888 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = file;
@@ -38002,11 +38102,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 38001 "Photo.c"
+#line 38101 "Photo.c"
 		}
 #line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38005 "Photo.c"
+#line 38105 "Photo.c"
 	}
 #line 4895 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = file;
@@ -38028,11 +38128,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 38027 "Photo.c"
+#line 38127 "Photo.c"
 		}
 #line 4899 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38031 "Photo.c"
+#line 38131 "Photo.c"
 	}
 #line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = file;
@@ -38044,7 +38144,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 38043 "Photo.c"
+#line 38143 "Photo.c"
 	}
 #line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
@@ -38062,11 +38162,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 38061 "Photo.c"
+#line 38161 "Photo.c"
 		}
 #line 4906 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38065 "Photo.c"
+#line 38165 "Photo.c"
 	}
 #line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = file;
@@ -38078,7 +38178,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 38077 "Photo.c"
+#line 38177 "Photo.c"
 	}
 #line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
@@ -38096,11 +38196,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 38095 "Photo.c"
+#line 38195 "Photo.c"
 		}
 #line 4913 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38099 "Photo.c"
+#line 38199 "Photo.c"
 	}
 #line 4916 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_UNKNOWN;
@@ -38112,11 +38212,11 @@ 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 38111 "Photo.c"
+#line 38211 "Photo.c"
 	}
 #line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38115 "Photo.c"
+#line 38215 "Photo.c"
 }
 
 
@@ -38149,7 +38249,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 38148 "Photo.c"
+#line 38248 "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));
@@ -38169,7 +38269,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 38168 "Photo.c"
+#line 38268 "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));
@@ -38189,13 +38289,13 @@ static gboolean library_photo_source_collection_real_has_backlink (SourceCollect
 		result = TRUE;
 #line 4929 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38188 "Photo.c"
+#line 38288 "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 38194 "Photo.c"
+#line 38294 "Photo.c"
 }
 
 
@@ -38236,7 +38336,7 @@ 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 38235 "Photo.c"
+#line 38335 "Photo.c"
 }
 
 
@@ -38251,7 +38351,7 @@ static TransactionController* library_photo_source_collection_real_get_transacti
 	_tmp0_ = self->priv->_transaction_controller;
 #line 4456 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ == NULL) {
-#line 38250 "Photo.c"
+#line 38350 "Photo.c"
 		MediaSourceTransactionController* _tmp1_ = NULL;
 #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));
@@ -38259,7 +38359,7 @@ static TransactionController* library_photo_source_collection_real_get_transacti
 		_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 38258 "Photo.c"
+#line 38358 "Photo.c"
 	}
 #line 4459 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = self->priv->_transaction_controller;
@@ -38267,7 +38367,7 @@ static TransactionController* library_photo_source_collection_real_get_transacti
 	result = _tmp2_;
 #line 4459 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38266 "Photo.c"
+#line 38366 "Photo.c"
 }
 
 
@@ -38276,7 +38376,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 38275 "Photo.c"
+#line 38375 "Photo.c"
 }
 
 
@@ -38295,19 +38395,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 38294 "Photo.c"
+#line 38394 "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 38300 "Photo.c"
+#line 38400 "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 38306 "Photo.c"
+#line 38406 "Photo.c"
 }
 
 
@@ -38316,7 +38416,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 38315 "Photo.c"
+#line 38415 "Photo.c"
 }
 
 
@@ -38325,7 +38425,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 38324 "Photo.c"
+#line 38424 "Photo.c"
 }
 
 
@@ -38334,7 +38434,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 38333 "Photo.c"
+#line 38433 "Photo.c"
 }
 
 
@@ -38346,41 +38446,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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -38399,7 +38499,7 @@ static void library_photo_source_collection_class_init (LibraryPhotoSourceCollec
 	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 38398 "Photo.c"
+#line 38498 "Photo.c"
 }
 
 
@@ -38415,30 +38515,30 @@ static void library_photo_source_collection_instance_init (LibraryPhotoSourceCol
 #line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->_transaction_controller = NULL;
 #line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_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 4464 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->by_editable_file = _tmp0_;
 #line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_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 4466 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->by_raw_development_file = _tmp1_;
 #line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp2_ = gee_tree_multi_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _int64_compare_gcompare_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp2_ = gee_tree_multi_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _int64_compare_gcompare_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->filesize_to_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
 #line 4470 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp3_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL);
+	_tmp3_ = gee_hash_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, _int64_equal_gee_equal_data_func, NULL, NULL);
 #line 4470 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->photo_to_master_filesize = _tmp3_;
 #line 4472 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp4_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL);
+	_tmp4_ = gee_hash_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, _int64_equal_gee_equal_data_func, NULL, NULL);
 #line 4472 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->photo_to_editable_filesize = _tmp4_;
 #line 4474 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp5_ = gee_tree_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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 38437 "Photo.c"
+#line 38537 "Photo.c"
 }
 
 
@@ -38462,7 +38562,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 38461 "Photo.c"
+#line 38561 "Photo.c"
 }
 
 
@@ -38481,7 +38581,7 @@ 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 38480 "Photo.c"
+#line 38580 "Photo.c"
 }
 
 
@@ -38515,7 +38615,7 @@ 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 38514 "Photo.c"
+#line 38614 "Photo.c"
 		LibraryPhotoSourceCollection* _tmp4_ = NULL;
 		PhotoRow* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
@@ -38527,7 +38627,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 38526 "Photo.c"
+#line 38626 "Photo.c"
 	}
 #line 4972 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = row;
@@ -38535,7 +38635,7 @@ 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 38534 "Photo.c"
+#line 38634 "Photo.c"
 		PhotoRow* _tmp9_ = NULL;
 		guint64 _tmp10_ = 0ULL;
 #line 4973 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38544,18 +38644,18 @@ static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row)
 		_tmp10_ = _tmp9_->flags;
 #line 4973 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_photo_upgrade_rating_flags (self, _tmp10_);
-#line 38543 "Photo.c"
+#line 38643 "Photo.c"
 	}
 #line 4961 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 38547 "Photo.c"
+#line 38647 "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 38554 "Photo.c"
+#line 38654 "Photo.c"
 }
 
 
@@ -38605,7 +38705,7 @@ 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 38604 "Photo.c"
+#line 38704 "Photo.c"
 		LibraryPhotoSourceCollection* _tmp9_ = NULL;
 		PhotoImportParams* _tmp10_ = NULL;
 		PhotoRow* _tmp11_ = NULL;
@@ -38620,7 +38720,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 38619 "Photo.c"
+#line 38719 "Photo.c"
 	}
 #line 4986 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = import_params;
@@ -38630,7 +38730,7 @@ 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 38629 "Photo.c"
+#line 38729 "Photo.c"
 		PhotoImportParams* _tmp16_ = NULL;
 		PhotoRow* _tmp17_ = NULL;
 		guint64 _tmp18_ = 0ULL;
@@ -38642,18 +38742,18 @@ 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 38641 "Photo.c"
+#line 38741 "Photo.c"
 	}
 #line 4976 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 38645 "Photo.c"
+#line 38745 "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 38652 "Photo.c"
+#line 38752 "Photo.c"
 }
 
 
@@ -38703,38 +38803,38 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 #line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
 	all = _tmp4_;
 #line 4998 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 4998 "/home/jens/Source/shotwell/src/Photo.vala"
 	all_photos = _tmp5_;
 #line 4999 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp6_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp6_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 4999 "/home/jens/Source/shotwell/src/Photo.vala"
 	trashed_photos = _tmp6_;
 #line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp7_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp7_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
 	offline_photos = _tmp7_;
 #line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = all;
 #line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp9_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp9_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = _tmp9_;
 #line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
 	count = _tmp10_;
-#line 38721 "Photo.c"
+#line 38821 "Photo.c"
 	{
 		gint ctr = 0;
 #line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 		ctr = 0;
-#line 38726 "Photo.c"
+#line 38826 "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 38733 "Photo.c"
+#line 38833 "Photo.c"
 				gint _tmp13_ = 0;
 				gint _tmp14_ = 0;
 				PhotoRow* row = NULL;
@@ -38752,13 +38852,13 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 				void* _tmp30__target = NULL;
 #line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp11_) {
-#line 38751 "Photo.c"
+#line 38851 "Photo.c"
 					gint _tmp12_ = 0;
 #line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = ctr;
 #line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 					ctr = _tmp12_ + 1;
-#line 38757 "Photo.c"
+#line 38857 "Photo.c"
 				}
 #line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = FALSE;
@@ -38770,7 +38870,7 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 				if (!(_tmp13_ < _tmp14_)) {
 #line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 38769 "Photo.c"
+#line 38869 "Photo.c"
 				}
 #line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = all;
@@ -38796,7 +38896,7 @@ 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 38795 "Photo.c"
+#line 38895 "Photo.c"
 					GeeArrayList* _tmp23_ = NULL;
 					LibraryPhoto* _tmp24_ = NULL;
 #line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38805,14 +38905,14 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 					_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 38804 "Photo.c"
+#line 38904 "Photo.c"
 				} else {
 					guint64 _tmp25_ = 0ULL;
 #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 38811 "Photo.c"
+#line 38911 "Photo.c"
 						GeeArrayList* _tmp26_ = NULL;
 						LibraryPhoto* _tmp27_ = NULL;
 #line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38821,7 +38921,7 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 						_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 38820 "Photo.c"
+#line 38920 "Photo.c"
 					} else {
 						GeeArrayList* _tmp28_ = NULL;
 						LibraryPhoto* _tmp29_ = NULL;
@@ -38831,7 +38931,7 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 						_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 38830 "Photo.c"
+#line 38930 "Photo.c"
 					}
 				}
 #line 5014 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38840,7 +38940,7 @@ 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 38839 "Photo.c"
+#line 38939 "Photo.c"
 					ProgressMonitor _tmp31_ = NULL;
 					void* _tmp31__target = NULL;
 					gint _tmp32_ = 0;
@@ -38855,13 +38955,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 38854 "Photo.c"
+#line 38954 "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 38860 "Photo.c"
+#line 38960 "Photo.c"
 			}
 		}
 	}
@@ -38895,14 +38995,14 @@ 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 38894 "Photo.c"
+#line 38994 "Photo.c"
 }
 
 
 void library_photo_terminate (void) {
 #line 5024 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_terminate_photo ();
-#line 38901 "Photo.c"
+#line 39001 "Photo.c"
 }
 
 
@@ -38951,15 +39051,15 @@ ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhot
 		if (photo) {
 #line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
 			*photo = _vala_photo;
-#line 38950 "Photo.c"
+#line 39050 "Photo.c"
 		} else {
 #line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_vala_photo);
-#line 38954 "Photo.c"
+#line 39054 "Photo.c"
 		}
 #line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38958 "Photo.c"
+#line 39058 "Photo.c"
 	}
 #line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = params;
@@ -38975,15 +39075,15 @@ ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhot
 	if (photo) {
 #line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
 		*photo = _vala_photo;
-#line 38974 "Photo.c"
+#line 39074 "Photo.c"
 	} else {
 #line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_vala_photo);
-#line 38978 "Photo.c"
+#line 39078 "Photo.c"
 	}
 #line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38982 "Photo.c"
+#line 39082 "Photo.c"
 }
 
 
@@ -38991,7 +39091,7 @@ 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 38990 "Photo.c"
+#line 39090 "Photo.c"
 	{
 		PhotoTable* _tmp0_ = NULL;
 		PhotoTable* _tmp1_ = NULL;
@@ -39013,7 +39113,7 @@ 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 39012 "Photo.c"
+#line 39112 "Photo.c"
 				goto __catch406_database_error;
 			}
 #line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39022,7 +39122,7 @@ void library_photo_import_failed (LibraryPhoto* photo) {
 			g_clear_error (&_inner_error_);
 #line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 39021 "Photo.c"
+#line 39121 "Photo.c"
 		}
 	}
 	goto __finally406;
@@ -39040,7 +39140,7 @@ 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 39039 "Photo.c"
+#line 39139 "Photo.c"
 	}
 	__finally406:
 #line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39051,7 +39151,7 @@ void library_photo_import_failed (LibraryPhoto* photo) {
 		g_clear_error (&_inner_error_);
 #line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39050 "Photo.c"
+#line 39150 "Photo.c"
 	}
 }
 
@@ -39075,7 +39175,7 @@ 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 39074 "Photo.c"
+#line 39174 "Photo.c"
 }
 
 
@@ -39098,7 +39198,7 @@ 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 39097 "Photo.c"
+#line 39197 "Photo.c"
 }
 
 
@@ -39121,7 +39221,7 @@ 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 39120 "Photo.c"
+#line 39220 "Photo.c"
 }
 
 
@@ -39144,7 +39244,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 39143 "Photo.c"
+#line 39243 "Photo.c"
 }
 
 
@@ -39152,13 +39252,13 @@ 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 39151 "Photo.c"
+#line 39251 "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 39157 "Photo.c"
+#line 39257 "Photo.c"
 			goto __catch407_g_error;
 		}
 	}
@@ -39188,7 +39288,7 @@ 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 39187 "Photo.c"
+#line 39287 "Photo.c"
 	}
 	__finally407:
 #line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39199,11 +39299,11 @@ static void library_photo_generate_thumbnails (LibraryPhoto* self) {
 		g_clear_error (&_inner_error_);
 #line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39198 "Photo.c"
+#line 39298 "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 39202 "Photo.c"
+#line 39302 "Photo.c"
 }
 
 
@@ -39221,7 +39321,7 @@ GeeCollection* library_photo_get_import_keywords (LibraryPhoto* self) {
 	result = _tmp1_;
 #line 5091 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39220 "Photo.c"
+#line 39320 "Photo.c"
 }
 
 
@@ -39232,7 +39332,7 @@ 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 39231 "Photo.c"
+#line 39331 "Photo.c"
 }
 
 
@@ -39249,7 +39349,7 @@ 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 39248 "Photo.c"
+#line 39348 "Photo.c"
 		Alteration* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 #line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39258,27 +39358,27 @@ static void library_photo_real_notify_altered (DataObject* base, Alteration* alt
 		_tmp3_ = alteration_has_subject (_tmp2_, "image");
 #line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_;
-#line 39257 "Photo.c"
+#line 39357 "Photo.c"
 	} else {
 #line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = FALSE;
-#line 39261 "Photo.c"
+#line 39361 "Photo.c"
 	}
 #line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
-#line 39265 "Photo.c"
+#line 39365 "Photo.c"
 		OneShotScheduler* _tmp4_ = NULL;
 #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 39271 "Photo.c"
+#line 39371 "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 39277 "Photo.c"
+#line 39377 "Photo.c"
 }
 
 
@@ -39303,7 +39403,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 39302 "Photo.c"
+#line 39402 "Photo.c"
 	}
 #line 5109 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = scaling_perform_on_pixbuf (scaling, pixbuf, GDK_INTERP_BILINEAR, TRUE);
@@ -39313,7 +39413,7 @@ 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 39312 "Photo.c"
+#line 39412 "Photo.c"
 }
 
 
@@ -39331,7 +39431,7 @@ 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 39330 "Photo.c"
+#line 39430 "Photo.c"
 	{
 		Rotation _tmp1_ = 0;
 #line 5124 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39340,7 +39440,7 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) {
 		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 39339 "Photo.c"
+#line 39439 "Photo.c"
 			goto __catch408_g_error;
 		}
 	}
@@ -39370,7 +39470,7 @@ 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 39369 "Photo.c"
+#line 39469 "Photo.c"
 	}
 	__finally408:
 #line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39381,11 +39481,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 39380 "Photo.c"
+#line 39480 "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 39384 "Photo.c"
+#line 39484 "Photo.c"
 }
 
 
@@ -39411,7 +39511,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 39410 "Photo.c"
+#line 39510 "Photo.c"
 	}
 #line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp0_;
@@ -39423,14 +39523,14 @@ 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 39422 "Photo.c"
+#line 39522 "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 39429 "Photo.c"
+#line 39529 "Photo.c"
 }
 
 
@@ -39457,7 +39557,7 @@ 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 39456 "Photo.c"
+#line 39556 "Photo.c"
 	} else {
 		BackingPhotoRow* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
@@ -39467,7 +39567,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 		_tmp3_ = _tmp2_->filepath;
 #line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_ == NULL;
-#line 39466 "Photo.c"
+#line 39566 "Photo.c"
 	}
 #line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
@@ -39475,7 +39575,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 39474 "Photo.c"
+#line 39574 "Photo.c"
 	}
 #line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = backing;
@@ -39491,7 +39591,7 @@ 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 39490 "Photo.c"
+#line 39590 "Photo.c"
 		GFile* dupe_file = NULL;
 		GFile* _tmp9_ = NULL;
 		GFile* _tmp10_ = NULL;
@@ -39515,7 +39615,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 39514 "Photo.c"
+#line 39614 "Photo.c"
 		}
 #line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = dupe_file;
@@ -39539,13 +39639,13 @@ 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 39538 "Photo.c"
+#line 39638 "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 39544 "Photo.c"
+#line 39644 "Photo.c"
 			BackingPhotoTable* _tmp15_ = NULL;
 			BackingPhotoTable* _tmp16_ = NULL;
 			BackingPhotoRow* _tmp17_ = NULL;
@@ -39575,7 +39675,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 39574 "Photo.c"
+#line 39674 "Photo.c"
 			}
 #line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = state;
@@ -39583,7 +39683,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 39582 "Photo.c"
+#line 39682 "Photo.c"
 		}
 #line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (state);
@@ -39591,7 +39691,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 39590 "Photo.c"
+#line 39690 "Photo.c"
 	}
 #line 5158 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = backing_id;
@@ -39599,7 +39699,7 @@ 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 39598 "Photo.c"
+#line 39698 "Photo.c"
 }
 
 
@@ -39684,7 +39784,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 39683 "Photo.c"
+#line 39783 "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));
@@ -39706,7 +39806,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 39705 "Photo.c"
+#line 39805 "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);
@@ -39728,7 +39828,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 39727 "Photo.c"
+#line 39827 "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);
@@ -39750,7 +39850,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 39749 "Photo.c"
+#line 39849 "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);
@@ -39772,7 +39872,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 39771 "Photo.c"
+#line 39871 "Photo.c"
 	}
 #line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = photo_table_get_instance ();
@@ -39846,7 +39946,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 	_g_object_unref0 (_tmp44_);
 #line 5189 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp45_) {
-#line 39845 "Photo.c"
+#line 39945 "Photo.c"
 		LibraryPhoto* _tmp46_ = NULL;
 		Event* _tmp47_ = NULL;
 		Event* _tmp48_ = NULL;
@@ -39863,7 +39963,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 39862 "Photo.c"
+#line 39962 "Photo.c"
 	}
 #line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp50_ = tag_global;
@@ -39875,7 +39975,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 	_tmp52_ = tags;
 #line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp52_ != NULL) {
-#line 39874 "Photo.c"
+#line 39974 "Photo.c"
 		{
 			GeeIterator* _tag_it = NULL;
 			GeeCollection* _tmp53_ = NULL;
@@ -39888,7 +39988,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 			_tag_it = _tmp54_;
 #line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 39887 "Photo.c"
+#line 39987 "Photo.c"
 				GeeIterator* _tmp55_ = NULL;
 				gboolean _tmp56_ = FALSE;
 				Tag* tag = NULL;
@@ -39904,7 +40004,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 				if (!_tmp56_) {
 #line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 39903 "Photo.c"
+#line 40003 "Photo.c"
 				}
 #line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp57_ = _tag_it;
@@ -39920,11 +40020,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 39919 "Photo.c"
+#line 40019 "Photo.c"
 			}
 #line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tag_it);
-#line 39923 "Photo.c"
+#line 40023 "Photo.c"
 		}
 	}
 #line 5200 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39937,7 +40037,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 39936 "Photo.c"
+#line 40036 "Photo.c"
 }
 
 
@@ -39946,7 +40046,7 @@ 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 39945 "Photo.c"
+#line 40045 "Photo.c"
 }
 
 
@@ -39963,7 +40063,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 39962 "Photo.c"
+#line 40062 "Photo.c"
 	}
 #line 5213 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = flags;
@@ -39973,7 +40073,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 39972 "Photo.c"
+#line 40072 "Photo.c"
 	}
 }
 
@@ -39990,7 +40090,7 @@ static gboolean library_photo_real_is_trashed (MediaSource* base) {
 	result = _tmp0_;
 #line 5221 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39989 "Photo.c"
+#line 40089 "Photo.c"
 }
 
 
@@ -40000,7 +40100,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 39999 "Photo.c"
+#line 40099 "Photo.c"
 }
 
 
@@ -40010,7 +40110,7 @@ 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 40009 "Photo.c"
+#line 40109 "Photo.c"
 }
 
 
@@ -40026,7 +40126,7 @@ static gboolean library_photo_real_is_offline (Monitorable* base) {
 	result = _tmp0_;
 #line 5233 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40025 "Photo.c"
+#line 40125 "Photo.c"
 }
 
 
@@ -40036,7 +40136,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 40035 "Photo.c"
+#line 40135 "Photo.c"
 }
 
 
@@ -40046,7 +40146,7 @@ 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 40045 "Photo.c"
+#line 40145 "Photo.c"
 }
 
 
@@ -40062,7 +40162,7 @@ static gboolean library_photo_real_is_flagged (Flaggable* base) {
 	result = _tmp0_;
 #line 5245 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40061 "Photo.c"
+#line 40161 "Photo.c"
 }
 
 
@@ -40080,7 +40180,7 @@ 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 40079 "Photo.c"
+#line 40179 "Photo.c"
 }
 
 
@@ -40098,7 +40198,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 40097 "Photo.c"
+#line 40197 "Photo.c"
 }
 
 
@@ -40107,7 +40207,7 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp3_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 5256 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
@@ -40117,11 +40217,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"
+		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 FALSE;
-#line 40120 "Photo.c"
+		return _tmp2_;
+#line 40222 "Photo.c"
 	}
 #line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp0_) {
@@ -40129,15 +40231,15 @@ 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 40128 "Photo.c"
+#line 40230 "Photo.c"
 	}
 #line 5262 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp2_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
+	_tmp3_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 5262 "/home/jens/Source/shotwell/src/Photo.vala"
-	result = _tmp2_;
+	result = _tmp3_;
 #line 5262 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40136 "Photo.c"
+#line 40238 "Photo.c"
 }
 
 
@@ -40154,7 +40256,7 @@ 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 40153 "Photo.c"
+#line 40255 "Photo.c"
 	{
 		PhotoTable* _tmp1_ = NULL;
 		PhotoTable* _tmp2_ = NULL;
@@ -40173,7 +40275,7 @@ 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 40172 "Photo.c"
+#line 40274 "Photo.c"
 				goto __catch409_database_error;
 			}
 #line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40182,7 +40284,7 @@ static void library_photo_real_destroy (DataSource* base) {
 			g_clear_error (&_inner_error_);
 #line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 40181 "Photo.c"
+#line 40283 "Photo.c"
 		}
 	}
 	goto __finally409;
@@ -40200,7 +40302,7 @@ 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 40199 "Photo.c"
+#line 40301 "Photo.c"
 	}
 	__finally409:
 #line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40211,11 +40313,11 @@ static void library_photo_real_destroy (DataSource* base) {
 		g_clear_error (&_inner_error_);
 #line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 40210 "Photo.c"
+#line 40312 "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 40214 "Photo.c"
+#line 40316 "Photo.c"
 }
 
 
@@ -40245,7 +40347,7 @@ 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 40244 "Photo.c"
+#line 40346 "Photo.c"
 }
 
 
@@ -40291,7 +40393,7 @@ 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 40290 "Photo.c"
+#line 40392 "Photo.c"
 	} else {
 		PhotoID* _tmp8_ = NULL;
 		gint _tmp8__length1 = 0;
@@ -40301,11 +40403,11 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 		_tmp8__length1 = ids_length1;
 #line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp8__length1 == 0;
-#line 40300 "Photo.c"
+#line 40402 "Photo.c"
 	}
 #line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 40304 "Photo.c"
+#line 40406 "Photo.c"
 		PhotoID _tmp9_ = {0};
 #line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_id_init (&_tmp9_, PHOTO_ID_INVALID);
@@ -40315,13 +40417,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 40314 "Photo.c"
+#line 40416 "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 40320 "Photo.c"
+#line 40422 "Photo.c"
 	{
 		PhotoID* id_collection = NULL;
 		gint id_collection_length1 = 0;
@@ -40333,11 +40435,11 @@ 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 40332 "Photo.c"
+#line 40434 "Photo.c"
 			PhotoID id = {0};
 #line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 			id = id_collection[id_it];
-#line 40336 "Photo.c"
+#line 40438 "Photo.c"
 			{
 				LibraryPhoto* photo = NULL;
 				LibraryPhotoSourceCollection* _tmp11_ = NULL;
@@ -40357,7 +40459,7 @@ 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 40356 "Photo.c"
+#line 40458 "Photo.c"
 					LibraryPhoto* _tmp16_ = NULL;
 					gboolean _tmp17_ = FALSE;
 #line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40366,11 +40468,11 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 					_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 40365 "Photo.c"
+#line 40467 "Photo.c"
 				} else {
 #line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = FALSE;
-#line 40369 "Photo.c"
+#line 40471 "Photo.c"
 				}
 #line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp14_) {
@@ -40382,11 +40484,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 40381 "Photo.c"
+#line 40483 "Photo.c"
 				}
 #line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 40385 "Photo.c"
+#line 40487 "Photo.c"
 			}
 		}
 	}
@@ -40398,7 +40500,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 40397 "Photo.c"
+#line 40499 "Photo.c"
 }
 
 
@@ -40443,7 +40545,7 @@ 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 40442 "Photo.c"
+#line 40544 "Photo.c"
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
 		GeeList* _tmp6_ = NULL;
@@ -40453,7 +40555,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 		if (_tmp6_ != NULL) {
 #line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = TRUE;
-#line 40452 "Photo.c"
+#line 40554 "Photo.c"
 		} else {
 			GeeList* _tmp7_ = NULL;
 			gint _tmp8_ = 0;
@@ -40466,20 +40568,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 40465 "Photo.c"
+#line 40567 "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 40471 "Photo.c"
+#line 40573 "Photo.c"
 		} else {
 			Rating _tmp10_ = 0;
 #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 40478 "Photo.c"
+#line 40580 "Photo.c"
 		}
 #line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp4_;
@@ -40489,7 +40591,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 40488 "Photo.c"
+#line 40590 "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));
@@ -40507,7 +40609,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 40506 "Photo.c"
+#line 40608 "Photo.c"
 	}
 #line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = metadata;
@@ -40519,7 +40621,7 @@ 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 40518 "Photo.c"
+#line 40620 "Photo.c"
 		GeeList* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
 		gint _tmp20_ = 0;
@@ -40531,11 +40633,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 40530 "Photo.c"
+#line 40632 "Photo.c"
 	} else {
 #line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = 0;
-#line 40534 "Photo.c"
+#line 40636 "Photo.c"
 	}
 #line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 	tags_count = _tmp16_;
@@ -40543,7 +40645,7 @@ 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 40542 "Photo.c"
+#line 40644 "Photo.c"
 		GeeSet* _tmp23_ = NULL;
 		gint _tmp24_ = 0;
 		gint _tmp25_ = 0;
@@ -40555,11 +40657,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 40554 "Photo.c"
+#line 40656 "Photo.c"
 	} else {
 #line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = 0;
-#line 40558 "Photo.c"
+#line 40660 "Photo.c"
 	}
 #line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 	keywords_count = _tmp21_;
@@ -40579,27 +40681,27 @@ 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 40578 "Photo.c"
+#line 40680 "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 40584 "Photo.c"
+#line 40686 "Photo.c"
 		GeeSet* _tmp30_ = NULL;
 #line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = keywords;
 #line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = _tmp30_ != NULL;
-#line 40590 "Photo.c"
+#line 40692 "Photo.c"
 	} else {
 #line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = FALSE;
-#line 40594 "Photo.c"
+#line 40696 "Photo.c"
 	}
 #line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp28_) {
-#line 40598 "Photo.c"
+#line 40700 "Photo.c"
 		{
 			GeeList* _tag_list = NULL;
 			GeeList* _tmp31_ = NULL;
@@ -40627,7 +40729,7 @@ 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 40626 "Photo.c"
+#line 40728 "Photo.c"
 				gint _tmp36_ = 0;
 				gint _tmp37_ = 0;
 				gint _tmp38_ = 0;
@@ -40655,7 +40757,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 40654 "Photo.c"
+#line 40756 "Photo.c"
 				}
 #line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = _tag_list;
@@ -40701,15 +40803,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 40700 "Photo.c"
+#line 40802 "Photo.c"
 				}
 #line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (tag);
-#line 40704 "Photo.c"
+#line 40806 "Photo.c"
 			}
 #line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tag_list);
-#line 40708 "Photo.c"
+#line 40810 "Photo.c"
 		}
 	}
 #line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40722,7 +40824,7 @@ 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 40721 "Photo.c"
+#line 40823 "Photo.c"
 }
 
 
@@ -40748,16 +40850,16 @@ 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 40747 "Photo.c"
+#line 40849 "Photo.c"
 		GeeCollection* string_tags = NULL;
 		GeeArrayList* _tmp3_ = NULL;
 		PhotoMetadata* _tmp19_ = NULL;
 		GeeCollection* _tmp20_ = NULL;
 #line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp3_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+		_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 40756 "Photo.c"
+#line 40858 "Photo.c"
 		{
 			GeeList* _tag_list = NULL;
 			GeeList* _tmp4_ = NULL;
@@ -40785,7 +40887,7 @@ 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 40784 "Photo.c"
+#line 40886 "Photo.c"
 				gint _tmp9_ = 0;
 				gint _tmp10_ = 0;
 				gint _tmp11_ = 0;
@@ -40809,7 +40911,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 40808 "Photo.c"
+#line 40910 "Photo.c"
 				}
 #line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tag_list;
@@ -40833,11 +40935,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 40832 "Photo.c"
+#line 40934 "Photo.c"
 			}
 #line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tag_list);
-#line 40836 "Photo.c"
+#line 40938 "Photo.c"
 		}
 #line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = metadata;
@@ -40847,14 +40949,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 40846 "Photo.c"
+#line 40948 "Photo.c"
 	} else {
 		PhotoMetadata* _tmp21_ = NULL;
 #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 40853 "Photo.c"
+#line 40955 "Photo.c"
 	}
 #line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = metadata;
@@ -40864,7 +40966,7 @@ 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 40863 "Photo.c"
+#line 40965 "Photo.c"
 }
 
 
@@ -40890,7 +40992,7 @@ 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 40889 "Photo.c"
+#line 40991 "Photo.c"
 		PhotoMetadata* _tmp2_ = NULL;
 		GeeSet* _tmp3_ = NULL;
 		GeeSet* _tmp4_ = NULL;
@@ -40909,7 +41011,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 40908 "Photo.c"
+#line 41010 "Photo.c"
 	}
 #line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = metadata;
@@ -40921,7 +41023,7 @@ 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 40920 "Photo.c"
+#line 41022 "Photo.c"
 		{
 			GeeIterator* _keyword_it = NULL;
 			GeeCollection* _tmp9_ = NULL;
@@ -40934,7 +41036,7 @@ 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 40933 "Photo.c"
+#line 41035 "Photo.c"
 				GeeIterator* _tmp11_ = NULL;
 				gboolean _tmp12_ = FALSE;
 				gchar* keyword = NULL;
@@ -40965,7 +41067,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 40964 "Photo.c"
+#line 41066 "Photo.c"
 				}
 #line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _keyword_it;
@@ -40977,7 +41079,7 @@ 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 40976 "Photo.c"
+#line 41078 "Photo.c"
 					HierarchicalTagIndex* _tmp17_ = NULL;
 					const gchar* _tmp18_ = NULL;
 					gboolean _tmp19_ = FALSE;
@@ -40989,11 +41091,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 40988 "Photo.c"
+#line 41090 "Photo.c"
 				} else {
 #line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = FALSE;
-#line 40992 "Photo.c"
+#line 41094 "Photo.c"
 				}
 #line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp15_) {
@@ -41001,7 +41103,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 41000 "Photo.c"
+#line 41102 "Photo.c"
 				}
 #line 5359 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = keyword;
@@ -41023,7 +41125,7 @@ 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 41022 "Photo.c"
+#line 41124 "Photo.c"
 					const gchar* _tmp27_ = NULL;
 					Tag* _tmp28_ = NULL;
 					Tag* _tmp29_ = NULL;
@@ -41045,7 +41147,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 41044 "Photo.c"
+#line 41146 "Photo.c"
 				}
 #line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = tag_global;
@@ -41055,7 +41157,7 @@ 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 41054 "Photo.c"
+#line 41156 "Photo.c"
 					const gchar* _tmp33_ = NULL;
 					Tag* _tmp34_ = NULL;
 					Tag* _tmp35_ = NULL;
@@ -41077,7 +41179,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 41076 "Photo.c"
+#line 41178 "Photo.c"
 				}
 #line 5373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = keyword;
@@ -41095,18 +41197,18 @@ 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 41094 "Photo.c"
+#line 41196 "Photo.c"
 			}
 #line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_keyword_it);
-#line 41098 "Photo.c"
+#line 41200 "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 41105 "Photo.c"
+#line 41207 "Photo.c"
 		{
 			GeeIterator* _path_it = NULL;
 			HierarchicalTagIndex* _tmp40_ = NULL;
@@ -41130,7 +41232,7 @@ 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 41129 "Photo.c"
+#line 41231 "Photo.c"
 				GeeIterator* _tmp45_ = NULL;
 				gboolean _tmp46_ = FALSE;
 				gchar* path = NULL;
@@ -41147,7 +41249,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 41146 "Photo.c"
+#line 41248 "Photo.c"
 				}
 #line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = _path_it;
@@ -41167,18 +41269,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 41166 "Photo.c"
+#line 41268 "Photo.c"
 			}
 #line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_path_it);
-#line 41170 "Photo.c"
+#line 41272 "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 41177 "Photo.c"
+#line 41279 "Photo.c"
 }
 
 
@@ -41188,46 +41290,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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 41226 "Photo.c"
+#line 41328 "Photo.c"
 }
 
 
@@ -41240,7 +41342,7 @@ static void library_photo_flaggable_interface_init (FlaggableIface * iface) {
 	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 41239 "Photo.c"
+#line 41341 "Photo.c"
 }
 
 
@@ -41257,7 +41359,7 @@ static void library_photo_monitorable_interface_init (MonitorableIface * iface)
 	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 41256 "Photo.c"
+#line 41358 "Photo.c"
 }
 
 
@@ -41268,7 +41370,7 @@ 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 41267 "Photo.c"
+#line 41369 "Photo.c"
 }
 
 
@@ -41282,7 +41384,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 41281 "Photo.c"
+#line 41383 "Photo.c"
 }
 
 
@@ -41325,14 +41427,14 @@ 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 41324 "Photo.c"
+#line 41426 "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 41331 "Photo.c"
+#line 41433 "Photo.c"
 }
 
 
@@ -41370,7 +41472,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 41369 "Photo.c"
+#line 41471 "Photo.c"
 	}
 #line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = self->priv->development_file_map;
@@ -41384,21 +41486,21 @@ 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 41383 "Photo.c"
+#line 41485 "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 41390 "Photo.c"
+#line 41492 "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 41397 "Photo.c"
+#line 41499 "Photo.c"
 }
 
 
@@ -41418,7 +41520,7 @@ 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 41417 "Photo.c"
+#line 41519 "Photo.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp1_ = NULL;
@@ -41431,7 +41533,7 @@ 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 41430 "Photo.c"
+#line 41532 "Photo.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				DataSource* source = NULL;
@@ -41458,7 +41560,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 41457 "Photo.c"
+#line 41559 "Photo.c"
 				}
 #line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _source_it;
@@ -41484,7 +41586,7 @@ 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 41483 "Photo.c"
+#line 41585 "Photo.c"
 					GeeHashMap* _tmp13_ = NULL;
 					LibraryPhoto* _tmp14_ = NULL;
 					GFile* _tmp15_ = NULL;
@@ -41523,7 +41625,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 41522 "Photo.c"
+#line 41624 "Photo.c"
 				}
 #line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = photo;
@@ -41535,7 +41637,7 @@ 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 41534 "Photo.c"
+#line 41636 "Photo.c"
 					{
 						GeeIterator* _f_it = NULL;
 						GeeCollection* _tmp26_ = NULL;
@@ -41548,7 +41650,7 @@ 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 41547 "Photo.c"
+#line 41649 "Photo.c"
 							GeeIterator* _tmp28_ = NULL;
 							gboolean _tmp29_ = FALSE;
 							GFile* f = NULL;
@@ -41568,7 +41670,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 41567 "Photo.c"
+#line 41669 "Photo.c"
 							}
 #line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp30_ = _f_it;
@@ -41594,11 +41696,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 41593 "Photo.c"
+#line 41695 "Photo.c"
 						}
 #line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_f_it);
-#line 41597 "Photo.c"
+#line 41699 "Photo.c"
 					}
 				}
 #line 5430 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41615,18 +41717,18 @@ 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 41614 "Photo.c"
+#line 41716 "Photo.c"
 			}
 #line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_source_it);
-#line 41618 "Photo.c"
+#line 41720 "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 41625 "Photo.c"
+#line 41727 "Photo.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp41_ = NULL;
@@ -41639,7 +41741,7 @@ 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 41638 "Photo.c"
+#line 41740 "Photo.c"
 				GeeIterator* _tmp43_ = NULL;
 				gboolean _tmp44_ = FALSE;
 				DataSource* source = NULL;
@@ -41664,7 +41766,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 41663 "Photo.c"
+#line 41765 "Photo.c"
 				}
 #line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = _source_it;
@@ -41678,7 +41780,7 @@ 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 41677 "Photo.c"
+#line 41779 "Photo.c"
 				{
 					GeeIterator* _f_it = NULL;
 					GeeMultiMap* _tmp49_ = NULL;
@@ -41705,7 +41807,7 @@ 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 41704 "Photo.c"
+#line 41806 "Photo.c"
 						GeeIterator* _tmp55_ = NULL;
 						gboolean _tmp56_ = FALSE;
 						GFile* f = NULL;
@@ -41721,7 +41823,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 41720 "Photo.c"
+#line 41822 "Photo.c"
 						}
 #line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp57_ = _f_it;
@@ -41737,11 +41839,11 @@ 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 41736 "Photo.c"
+#line 41838 "Photo.c"
 					}
 #line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_f_it);
-#line 41740 "Photo.c"
+#line 41842 "Photo.c"
 				}
 				{
 					GeeIterator* _f_it = NULL;
@@ -41769,7 +41871,7 @@ 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 41768 "Photo.c"
+#line 41870 "Photo.c"
 						GeeIterator* _tmp67_ = NULL;
 						gboolean _tmp68_ = FALSE;
 						GFile* f = NULL;
@@ -41785,7 +41887,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 41784 "Photo.c"
+#line 41886 "Photo.c"
 						}
 #line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp69_ = _f_it;
@@ -41801,11 +41903,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 41800 "Photo.c"
+#line 41902 "Photo.c"
 					}
 #line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_f_it);
-#line 41804 "Photo.c"
+#line 41906 "Photo.c"
 				}
 #line 5444 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp73_ = self->priv->reverse_editable_file_map;
@@ -41835,11 +41937,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 41834 "Photo.c"
+#line 41936 "Photo.c"
 			}
 #line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_source_it);
-#line 41838 "Photo.c"
+#line 41940 "Photo.c"
 		}
 	}
 #line 5452 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41848,7 +41950,7 @@ 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 41847 "Photo.c"
+#line 41949 "Photo.c"
 }
 
 
@@ -41884,7 +41986,7 @@ 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 41883 "Photo.c"
+#line 41985 "Photo.c"
 		GeeHashMap* _tmp4_ = NULL;
 		GFile* _tmp5_ = NULL;
 		GeeMultiMap* _tmp6_ = NULL;
@@ -41904,13 +42006,13 @@ 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 41903 "Photo.c"
+#line 42005 "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 41909 "Photo.c"
+#line 42011 "Photo.c"
 		GeeHashMap* _tmp10_ = NULL;
 		GFile* _tmp11_ = NULL;
 		LibraryPhoto* _tmp12_ = NULL;
@@ -41922,7 +42024,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 41921 "Photo.c"
+#line 42023 "Photo.c"
 	}
 #line 5466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = self->priv->reverse_editable_file_map;
@@ -41934,7 +42036,7 @@ 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 41933 "Photo.c"
+#line 42035 "Photo.c"
 }
 
 
@@ -41972,7 +42074,7 @@ 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 41971 "Photo.c"
+#line 42073 "Photo.c"
 		GeeMultiMap* _tmp18_ = NULL;
 		LibraryPhoto* _tmp19_ = NULL;
 		{
@@ -42001,7 +42103,7 @@ 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 42000 "Photo.c"
+#line 42102 "Photo.c"
 				GeeIterator* _tmp12_ = NULL;
 				gboolean _tmp13_ = FALSE;
 				GFile* f = NULL;
@@ -42017,7 +42119,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 42016 "Photo.c"
+#line 42118 "Photo.c"
 				}
 #line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = _f_it;
@@ -42033,11 +42135,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 42032 "Photo.c"
+#line 42134 "Photo.c"
 			}
 #line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_f_it);
-#line 42036 "Photo.c"
+#line 42138 "Photo.c"
 		}
 #line 5477 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = self->priv->reverse_development_file_map;
@@ -42045,7 +42147,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 42044 "Photo.c"
+#line 42146 "Photo.c"
 	}
 #line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = photo;
@@ -42057,7 +42159,7 @@ 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 42056 "Photo.c"
+#line 42158 "Photo.c"
 		{
 			GeeIterator* _f_it = NULL;
 			GeeCollection* _tmp23_ = NULL;
@@ -42070,7 +42172,7 @@ 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 42069 "Photo.c"
+#line 42171 "Photo.c"
 				GeeIterator* _tmp25_ = NULL;
 				gboolean _tmp26_ = FALSE;
 				GFile* f = NULL;
@@ -42090,7 +42192,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 42089 "Photo.c"
+#line 42191 "Photo.c"
 				}
 #line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = _f_it;
@@ -42116,18 +42218,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 42115 "Photo.c"
+#line 42217 "Photo.c"
 			}
 #line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_f_it);
-#line 42119 "Photo.c"
+#line 42221 "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 42126 "Photo.c"
+#line 42228 "Photo.c"
 }
 
 
@@ -42139,8 +42241,8 @@ 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 = library_photo_source_holding_tank_real_notify_contents_altered;
-#line 42139 "Photo.c"
+	((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*)(SourceHoldingTank*, GeeCollection*, GeeCollection*)) library_photo_source_holding_tank_real_notify_contents_altered;
+#line 42241 "Photo.c"
 }
 
 
@@ -42152,22 +42254,22 @@ static void library_photo_source_holding_tank_instance_init (LibraryPhotoSourceH
 #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"
-	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_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 5386 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->editable_file_map = _tmp0_;
 #line 5388 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_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 5388 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->development_file_map = _tmp1_;
 #line 5390 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp2_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, 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);
+	_tmp2_ = 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 5390 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->reverse_editable_file_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
 #line 5392 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp3_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, 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);
+	_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 42166 "Photo.c"
+#line 42268 "Photo.c"
 }
 
 
@@ -42185,7 +42287,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 42184 "Photo.c"
+#line 42286 "Photo.c"
 }
 
 
diff --git a/src/PhotoMonitor.c b/src/PhotoMonitor.c
index a1aed95..a23c52f 100644
--- a/src/PhotoMonitor.c
+++ b/src/PhotoMonitor.c
@@ -1,4 +1,4 @@
-/* PhotoMonitor.c generated by valac 0.34.4, the Vala compiler
+/* PhotoMonitor.c generated by valac 0.34.7, the Vala compiler
  * generated from PhotoMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1621,35 +1621,35 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = photo_updates_real_is_all_updated;
+	((MonitorableUpdatesClass *) klass)->is_all_updated = (gboolean (*)(MonitorableUpdates*)) photo_updates_real_is_all_updated;
 #line 1654 "PhotoMonitor.c"
 }
 
@@ -1677,7 +1677,7 @@ static void photo_updates_instance_init (PhotoUpdates * self) {
 #line 19 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self->revert_to_master = FALSE;
 #line 20 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 20 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self->developer_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 1684 "PhotoMonitor.c"
@@ -1859,7 +1859,7 @@ static void photo_monitor_real_close (MediaMonitor* base) {
 #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp0_ = self->priv->master_reimport_pending;
 #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+		_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp2_ = _tmp1_;
 #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1920,7 +1920,7 @@ static void photo_monitor_real_close (MediaMonitor* base) {
 #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp11_ = self->priv->editable_reimport_pending;
 #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_tmp12_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_MAP, GeeMap));
+		_tmp12_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp13_ = _tmp12_;
 #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1981,7 +1981,7 @@ static void photo_monitor_real_close (MediaMonitor* base) {
 #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"
-		_tmp23_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_MAP, GeeMap));
+		_tmp23_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp24_ = _tmp23_;
 #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2277,7 +2277,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 314 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 316 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp2_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp2_ = 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/PhotoMonitor.vala"
 	matched_masters = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 317 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2317,7 +2317,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp12_ = self->priv->matched_editables;
 #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp13_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp13_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp14_ = _tmp13_;
 #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2329,7 +2329,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp15_ = self->priv->matched_developments;
 #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp17_ = _tmp16_;
 #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2361,7 +2361,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 332 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp18_ = self->priv->matched_editables;
 #line 332 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 332 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp20_ = _tmp19_;
 #line 332 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2384,7 +2384,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 334 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp23_ = self->priv->matched_editables;
 #line 334 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_tmp24_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp24_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 334 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp25_ = _tmp24_;
 #line 334 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2408,7 +2408,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp29_ = self->priv->matched_editables;
 #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-			_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp31_ = _tmp30_;
 #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2464,7 +2464,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 						_tmp38_ = self->priv->matched_editables;
 #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-						_tmp39_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_COLLECTION, GeeCollection));
+						_tmp39_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 						_tmp40_ = _tmp39_;
 #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2525,7 +2525,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 346 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp53_ = self->priv->matched_developments;
 #line 346 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp54_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp54_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 346 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp55_ = _tmp54_;
 #line 346 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2548,7 +2548,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 348 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp58_ = self->priv->matched_developments;
 #line 348 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_tmp59_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp59_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 348 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp60_ = _tmp59_;
 #line 348 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2572,7 +2572,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp64_ = self->priv->matched_developments;
 #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-			_tmp65_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp65_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp66_ = _tmp65_;
 #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6226,7 +6226,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6225 "PhotoMonitor.c"
 					GeeHashMap* _tmp17_ = NULL;
 #line 936 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-					_tmp17_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+					_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"
 					_g_object_unref0 (set_editable_file);
 #line 936 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6288,7 +6288,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6287 "PhotoMonitor.c"
 					GeeHashMap* _tmp31_ = NULL;
 #line 945 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-					_tmp31_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+					_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"
 					_g_object_unref0 (set_editable_file_info);
 #line 945 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6350,7 +6350,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6349 "PhotoMonitor.c"
 					GeeHashMap* _tmp45_ = NULL;
 #line 954 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-					_tmp45_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, GEE_TYPE_COLLECTION, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+					_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"
 					_g_object_unref0 (set_raw_developer_files);
 #line 954 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6402,7 +6402,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6401 "PhotoMonitor.c"
 					GeeArrayList* _tmp57_ = NULL;
 #line 963 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-					_tmp57_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_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"
 					_g_object_unref0 (revert_to_master);
 #line 963 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6412,7 +6412,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 965 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp58_ = revert_to_master;
 #line 965 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-				_tmp59_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_COLLECTION, GeeCollection));
+				_tmp59_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 965 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp60_ = _tmp59_;
 #line 965 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6477,7 +6477,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6476 "PhotoMonitor.c"
 					GeeArrayList* _tmp71_ = NULL;
 #line 974 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-					_tmp71_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_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"
 					_g_object_unref0 (reimport_master);
 #line 974 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6541,7 +6541,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6540 "PhotoMonitor.c"
 					GeeArrayList* _tmp83_ = NULL;
 #line 984 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-					_tmp83_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_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"
 					_g_object_unref0 (reimport_editable);
 #line 984 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6797,7 +6797,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp107_ = revert_to_master;
 #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_tmp108_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp108_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp109_ = _tmp108_;
 #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6827,7 +6827,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp114_ = _photo_list;
 #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-			_tmp115_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp115_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp116_ = _tmp115_;
 #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6893,7 +6893,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp125_ = reimport_master;
 #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_tmp126_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp126_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp127_ = _tmp126_;
 #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6923,7 +6923,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp132_ = _photo_list;
 #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-			_tmp133_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp133_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp134_ = _tmp133_;
 #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7025,7 +7025,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp152_ = reimport_editable;
 #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_tmp153_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp152_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp153_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp152_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp154_ = _tmp153_;
 #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7055,7 +7055,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp159_ = _photo_list;
 #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-			_tmp160_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp159_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp160_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp159_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp161_ = _tmp160_;
 #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7157,7 +7157,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp179_ = reimport_raw_developments;
 #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_tmp180_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp179_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp180_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp179_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp181_ = _tmp180_;
 #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7187,7 +7187,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp186_ = _photo_list;
 #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-			_tmp187_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp186_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp187_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp186_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp188_ = _tmp187_;
 #line 1051 "/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 = photo_monitor_reimport_master_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) photo_monitor_reimport_master_job_real_execute;
 #line 8080 "PhotoMonitor.c"
 }
 
@@ -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 = photo_monitor_reimport_editable_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) photo_monitor_reimport_editable_job_real_execute;
 #line 8258 "PhotoMonitor.c"
 }
 
@@ -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 = 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"
 }
 
@@ -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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -8532,23 +8532,23 @@ static void photo_monitor_instance_init (PhotoMonitor * self) {
 #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"
-	_tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 228 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self->priv->matched_editables = _tmp0_;
 #line 229 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp1_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp1_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 229 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self->priv->matched_developments = _tmp1_;
 #line 230 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp2_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, PHOTO_MONITOR_TYPE_REIMPORT_MASTER_JOB, (GBoxedCopyFunc) background_job_ref, background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp2_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, PHOTO_MONITOR_TYPE_REIMPORT_MASTER_JOB, (GBoxedCopyFunc) background_job_ref, (GDestroyNotify) background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 230 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self->priv->master_reimport_pending = _tmp2_;
 #line 232 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp3_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, PHOTO_MONITOR_TYPE_REIMPORT_EDITABLE_JOB, (GBoxedCopyFunc) background_job_ref, background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp3_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, PHOTO_MONITOR_TYPE_REIMPORT_EDITABLE_JOB, (GBoxedCopyFunc) background_job_ref, (GDestroyNotify) background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 232 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self->priv->editable_reimport_pending = _tmp3_;
 #line 234 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp4_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, PHOTO_MONITOR_TYPE_REIMPORT_RAW_DEVELOPMENT_JOB, (GBoxedCopyFunc) background_job_ref, background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp4_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, PHOTO_MONITOR_TYPE_REIMPORT_RAW_DEVELOPMENT_JOB, (GBoxedCopyFunc) background_job_ref, (GDestroyNotify) background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 234 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self->priv->raw_developments_reimport_pending = _tmp4_;
 #line 8552 "PhotoMonitor.c"
diff --git a/src/PhotoPage.c b/src/PhotoPage.c
index 579add0..63363e0 100644
--- a/src/PhotoPage.c
+++ b/src/PhotoPage.c
@@ -1,4 +1,4 @@
-/* PhotoPage.c generated by valac 0.34.4, the Vala compiler
+/* PhotoPage.c generated by valac 0.34.7, the Vala compiler
  * generated from PhotoPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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"
 }
 
@@ -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 = zoom_buffer_transformation_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) zoom_buffer_transformation_job_real_execute;
 #line 4196 "PhotoPage.c"
 }
 
@@ -8911,9 +8911,9 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 	Dimensions max_dim = {0};
 	Photo* _tmp2_ = NULL;
 	Dimensions _tmp3_ = {0};
-	gboolean _tmp17_ = FALSE;
-	gboolean _tmp25_ = FALSE;
+	gboolean _tmp18_ = FALSE;
 	gboolean _tmp26_ = FALSE;
+	gboolean _tmp27_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 1269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
@@ -9030,6 +9030,8 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 	__finally248:
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 9029 "PhotoPage.c"
+		gboolean _tmp17_ = FALSE;
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (pixbuf);
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9039,82 +9041,82 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		return FALSE;
-#line 9039 "PhotoPage.c"
+		return _tmp17_;
+#line 9041 "PhotoPage.c"
 	}
 #line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_ = self->priv->photo_missing;
+	_tmp18_ = self->priv->photo_missing;
 #line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp17_) {
-#line 9045 "PhotoPage.c"
-		GdkPixbuf* _tmp18_ = NULL;
-		GdkPixbuf* _tmp22_ = NULL;
+	if (!_tmp18_) {
+#line 9047 "PhotoPage.c"
+		GdkPixbuf* _tmp19_ = NULL;
+		GdkPixbuf* _tmp23_ = NULL;
 #line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp18_ = pixbuf;
+		_tmp19_ = pixbuf;
 #line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp18_ == NULL) {
-#line 9052 "PhotoPage.c"
-			PixbufCache* _tmp19_ = NULL;
-			Photo* _tmp20_ = NULL;
-			GdkPixbuf* _tmp21_ = NULL;
+		if (_tmp19_ == NULL) {
+#line 9054 "PhotoPage.c"
+			PixbufCache* _tmp20_ = NULL;
+			Photo* _tmp21_ = NULL;
+			GdkPixbuf* _tmp22_ = NULL;
 #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp19_ = self->priv->cache;
+			_tmp20_ = self->priv->cache;
 #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp20_ = photo;
+			_tmp21_ = photo;
 #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp21_ = pixbuf_cache_get_ready_pixbuf (_tmp19_, _tmp20_);
+			_tmp22_ = pixbuf_cache_get_ready_pixbuf (_tmp20_, _tmp21_);
 #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
 #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			pixbuf = _tmp21_;
-#line 9066 "PhotoPage.c"
+			pixbuf = _tmp22_;
+#line 9068 "PhotoPage.c"
 		}
 #line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp22_ = pixbuf;
+		_tmp23_ = pixbuf;
 #line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp22_ == NULL) {
-#line 9072 "PhotoPage.c"
-			PixbufCache* _tmp23_ = NULL;
-			Photo* _tmp24_ = NULL;
+		if (_tmp23_ == NULL) {
+#line 9074 "PhotoPage.c"
+			PixbufCache* _tmp24_ = NULL;
+			Photo* _tmp25_ = NULL;
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp23_ = self->priv->cache;
+			_tmp24_ = self->priv->cache;
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp24_ = photo;
+			_tmp25_ = photo;
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			pixbuf_cache_prefetch (_tmp23_, _tmp24_, BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE);
-#line 9081 "PhotoPage.c"
+			pixbuf_cache_prefetch (_tmp24_, _tmp25_, BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE);
+#line 9083 "PhotoPage.c"
 		}
 	}
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp26_ = self->priv->photo_missing;
+	_tmp27_ = self->priv->photo_missing;
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp26_) {
-#line 9088 "PhotoPage.c"
-		GdkPixbuf* _tmp27_ = NULL;
+	if (!_tmp27_) {
+#line 9090 "PhotoPage.c"
+		GdkPixbuf* _tmp28_ = NULL;
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp27_ = pixbuf;
+		_tmp28_ = pixbuf;
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp25_ = _tmp27_ != NULL;
-#line 9094 "PhotoPage.c"
+		_tmp26_ = _tmp28_ != NULL;
+#line 9096 "PhotoPage.c"
 	} else {
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp25_ = FALSE;
-#line 9098 "PhotoPage.c"
+		_tmp26_ = FALSE;
+#line 9100 "PhotoPage.c"
 	}
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp25_) {
-#line 9102 "PhotoPage.c"
-		GdkPixbuf* _tmp28_ = NULL;
-		Dimensions _tmp29_ = {0};
+	if (_tmp26_) {
+#line 9104 "PhotoPage.c"
+		GdkPixbuf* _tmp29_ = NULL;
+		Dimensions _tmp30_ = {0};
 #line 1304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp28_ = pixbuf;
+		_tmp29_ = pixbuf;
 #line 1304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp29_ = max_dim;
+		_tmp30_ = max_dim;
 #line 1304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp28_, &_tmp29_, NULL);
+		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 9113 "PhotoPage.c"
+#line 9115 "PhotoPage.c"
 	}
 #line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
@@ -9124,7 +9126,7 @@ 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 9123 "PhotoPage.c"
+#line 9125 "PhotoPage.c"
 }
 
 
@@ -9141,7 +9143,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 9140 "PhotoPage.c"
+#line 9142 "PhotoPage.c"
 }
 
 
@@ -9157,7 +9159,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 9156 "PhotoPage.c"
+#line 9158 "PhotoPage.c"
 }
 
 
@@ -9170,7 +9172,7 @@ 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 9169 "PhotoPage.c"
+#line 9171 "PhotoPage.c"
 }
 
 
@@ -9254,21 +9256,21 @@ 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 9253 "PhotoPage.c"
+#line 9255 "PhotoPage.c"
 		gboolean _tmp14_ = FALSE;
 #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 9259 "PhotoPage.c"
+#line 9261 "PhotoPage.c"
 	} else {
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = FALSE;
-#line 9263 "PhotoPage.c"
+#line 9265 "PhotoPage.c"
 	}
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
-#line 9267 "PhotoPage.c"
+#line 9269 "PhotoPage.c"
 		Photo* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9277,15 +9279,15 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp16_ = photo_check_can_rotate (_tmp15_);
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp16_;
-#line 9276 "PhotoPage.c"
+#line 9278 "PhotoPage.c"
 	} else {
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = FALSE;
-#line 9280 "PhotoPage.c"
+#line 9282 "PhotoPage.c"
 	}
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_) {
-#line 9284 "PhotoPage.c"
+#line 9286 "PhotoPage.c"
 		Photo* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9294,11 +9296,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp18_ = editing_host_page_is_rotate_available (self, _tmp17_);
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp18_;
-#line 9293 "PhotoPage.c"
+#line 9295 "PhotoPage.c"
 	} else {
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = FALSE;
-#line 9297 "PhotoPage.c"
+#line 9299 "PhotoPage.c"
 	}
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = self->priv->rotate_button;
@@ -9308,21 +9310,21 @@ 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 9307 "PhotoPage.c"
+#line 9309 "PhotoPage.c"
 		gboolean _tmp23_ = FALSE;
 #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 9313 "PhotoPage.c"
+#line 9315 "PhotoPage.c"
 	} else {
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = FALSE;
-#line 9317 "PhotoPage.c"
+#line 9319 "PhotoPage.c"
 	}
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_) {
-#line 9321 "PhotoPage.c"
+#line 9323 "PhotoPage.c"
 		Photo* _tmp24_ = NULL;
 		Scaling _tmp25_ = {0};
 		gboolean _tmp26_ = FALSE;
@@ -9334,11 +9336,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 9333 "PhotoPage.c"
+#line 9335 "PhotoPage.c"
 	} else {
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = FALSE;
-#line 9337 "PhotoPage.c"
+#line 9339 "PhotoPage.c"
 	}
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = self->priv->crop_button;
@@ -9348,21 +9350,21 @@ 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 9347 "PhotoPage.c"
+#line 9349 "PhotoPage.c"
 		gboolean _tmp31_ = FALSE;
 #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 9353 "PhotoPage.c"
+#line 9355 "PhotoPage.c"
 	} else {
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = FALSE;
-#line 9357 "PhotoPage.c"
+#line 9359 "PhotoPage.c"
 	}
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp29_) {
-#line 9361 "PhotoPage.c"
+#line 9363 "PhotoPage.c"
 		Photo* _tmp32_ = NULL;
 		Scaling _tmp33_ = {0};
 		gboolean _tmp34_ = FALSE;
@@ -9374,11 +9376,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 9373 "PhotoPage.c"
+#line 9375 "PhotoPage.c"
 	} else {
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = FALSE;
-#line 9377 "PhotoPage.c"
+#line 9379 "PhotoPage.c"
 	}
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp35_ = self->priv->redeye_button;
@@ -9388,21 +9390,21 @@ 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 9387 "PhotoPage.c"
+#line 9389 "PhotoPage.c"
 		gboolean _tmp39_ = FALSE;
 #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 9393 "PhotoPage.c"
+#line 9395 "PhotoPage.c"
 	} else {
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = FALSE;
-#line 9397 "PhotoPage.c"
+#line 9399 "PhotoPage.c"
 	}
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp37_) {
-#line 9401 "PhotoPage.c"
+#line 9403 "PhotoPage.c"
 		Photo* _tmp40_ = NULL;
 		Scaling _tmp41_ = {0};
 		gboolean _tmp42_ = FALSE;
@@ -9414,11 +9416,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 9413 "PhotoPage.c"
+#line 9415 "PhotoPage.c"
 	} else {
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = FALSE;
-#line 9417 "PhotoPage.c"
+#line 9419 "PhotoPage.c"
 	}
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = self->priv->adjust_button;
@@ -9428,21 +9430,21 @@ 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 9427 "PhotoPage.c"
+#line 9429 "PhotoPage.c"
 		gboolean _tmp47_ = FALSE;
 #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 9433 "PhotoPage.c"
+#line 9435 "PhotoPage.c"
 	} else {
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = FALSE;
-#line 9437 "PhotoPage.c"
+#line 9439 "PhotoPage.c"
 	}
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp45_) {
-#line 9441 "PhotoPage.c"
+#line 9443 "PhotoPage.c"
 		Photo* _tmp48_ = NULL;
 		gboolean _tmp49_ = FALSE;
 #line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9451,11 +9453,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp49_ = editing_host_page_is_enhance_available (self, _tmp48_);
 #line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = _tmp49_;
-#line 9450 "PhotoPage.c"
+#line 9452 "PhotoPage.c"
 	} else {
 #line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = FALSE;
-#line 9454 "PhotoPage.c"
+#line 9456 "PhotoPage.c"
 	}
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp50_ = self->priv->enhance_button;
@@ -9465,21 +9467,21 @@ 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 9464 "PhotoPage.c"
+#line 9466 "PhotoPage.c"
 		gboolean _tmp54_ = FALSE;
 #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 9470 "PhotoPage.c"
+#line 9472 "PhotoPage.c"
 	} else {
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = FALSE;
-#line 9474 "PhotoPage.c"
+#line 9476 "PhotoPage.c"
 	}
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp52_) {
-#line 9478 "PhotoPage.c"
+#line 9480 "PhotoPage.c"
 		Photo* _tmp55_ = NULL;
 		Scaling _tmp56_ = {0};
 		gboolean _tmp57_ = FALSE;
@@ -9491,11 +9493,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 9490 "PhotoPage.c"
+#line 9492 "PhotoPage.c"
 	} else {
 #line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp51_ = FALSE;
-#line 9494 "PhotoPage.c"
+#line 9496 "PhotoPage.c"
 	}
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp58_ = self->priv->straighten_button;
@@ -9509,7 +9511,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 9508 "PhotoPage.c"
+#line 9510 "PhotoPage.c"
 }
 
 
@@ -9528,51 +9530,51 @@ static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey
 	_tmp3_ = self->priv->current_tool;
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 9527 "PhotoPage.c"
+#line 9529 "PhotoPage.c"
 		gboolean _tmp4_ = FALSE;
 #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 9533 "PhotoPage.c"
+#line 9535 "PhotoPage.c"
 	} else {
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = FALSE;
-#line 9537 "PhotoPage.c"
+#line 9539 "PhotoPage.c"
 	}
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 9541 "PhotoPage.c"
+#line 9543 "PhotoPage.c"
 		gboolean _tmp5_ = FALSE;
 #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 9547 "PhotoPage.c"
+#line 9549 "PhotoPage.c"
 	} else {
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 9551 "PhotoPage.c"
+#line 9553 "PhotoPage.c"
 	}
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 9555 "PhotoPage.c"
+#line 9557 "PhotoPage.c"
 		gboolean _tmp6_ = FALSE;
 #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 9561 "PhotoPage.c"
+#line 9563 "PhotoPage.c"
 	} else {
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 9565 "PhotoPage.c"
+#line 9567 "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 9571 "PhotoPage.c"
+#line 9573 "PhotoPage.c"
 	}
 #line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = event;
@@ -9582,7 +9584,7 @@ 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 9581 "PhotoPage.c"
+#line 9583 "PhotoPage.c"
 }
 
 
@@ -9600,7 +9602,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 9599 "PhotoPage.c"
+#line 9601 "PhotoPage.c"
 	}
 #line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
@@ -9610,7 +9612,7 @@ 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 9609 "PhotoPage.c"
+#line 9611 "PhotoPage.c"
 }
 
 
@@ -9628,7 +9630,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 9627 "PhotoPage.c"
+#line 9629 "PhotoPage.c"
 	}
 #line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
@@ -9638,7 +9640,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 9637 "PhotoPage.c"
+#line 9639 "PhotoPage.c"
 }
 
 
@@ -9656,37 +9658,37 @@ static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey*
 	_tmp2_ = self->priv->current_tool;
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ == NULL) {
-#line 9655 "PhotoPage.c"
+#line 9657 "PhotoPage.c"
 		gboolean _tmp3_ = FALSE;
 #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 9661 "PhotoPage.c"
+#line 9663 "PhotoPage.c"
 	} else {
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 9665 "PhotoPage.c"
+#line 9667 "PhotoPage.c"
 	}
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 9669 "PhotoPage.c"
+#line 9671 "PhotoPage.c"
 		gboolean _tmp4_ = FALSE;
 #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 9675 "PhotoPage.c"
+#line 9677 "PhotoPage.c"
 	} else {
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 9679 "PhotoPage.c"
+#line 9681 "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 9685 "PhotoPage.c"
+#line 9687 "PhotoPage.c"
 	}
 #line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
@@ -9696,7 +9698,7 @@ 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 9695 "PhotoPage.c"
+#line 9697 "PhotoPage.c"
 }
 
 
@@ -9712,7 +9714,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 	GError * _inner_error_ = NULL;
 #line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 9711 "PhotoPage.c"
+#line 9713 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Photo* _tmp1_ = NULL;
@@ -9737,7 +9739,7 @@ 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 9736 "PhotoPage.c"
+#line 9738 "PhotoPage.c"
 			goto __catch249_g_error;
 		}
 #line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9756,7 +9758,7 @@ 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 9755 "PhotoPage.c"
+#line 9757 "PhotoPage.c"
 	}
 	goto __finally249;
 	__catch249_g_error:
@@ -9772,7 +9774,7 @@ 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 9771 "PhotoPage.c"
+#line 9773 "PhotoPage.c"
 	}
 	__finally249:
 #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9785,7 +9787,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 9784 "PhotoPage.c"
+#line 9786 "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));
@@ -9803,7 +9805,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 9802 "PhotoPage.c"
+#line 9804 "PhotoPage.c"
 	}
 #line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = original;
@@ -9819,7 +9821,7 @@ 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 9818 "PhotoPage.c"
+#line 9820 "PhotoPage.c"
 }
 
 
@@ -9831,7 +9833,7 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) {
 	_tmp0_ = self->priv->swapped;
 #line 1417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 9830 "PhotoPage.c"
+#line 9832 "PhotoPage.c"
 		GdkPixbuf* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
@@ -9856,7 +9858,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 9855 "PhotoPage.c"
+#line 9857 "PhotoPage.c"
 	}
 }
 
@@ -9864,7 +9866,7 @@ 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 9863 "PhotoPage.c"
+#line 9865 "PhotoPage.c"
 }
 
 
@@ -9915,7 +9917,7 @@ 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 9914 "PhotoPage.c"
+#line 9916 "PhotoPage.c"
 	{
 		Dimensions tool_pixbuf_dim = {0};
 		Dimensions _tmp6_ = {0};
@@ -9953,7 +9955,7 @@ 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 9952 "PhotoPage.c"
+#line 9954 "PhotoPage.c"
 			goto __catch250_g_error;
 		}
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9968,17 +9970,17 @@ 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 9967 "PhotoPage.c"
+#line 9969 "PhotoPage.c"
 			Dimensions _tmp17_ = {0};
 #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 9973 "PhotoPage.c"
+#line 9975 "PhotoPage.c"
 		}
 #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 9977 "PhotoPage.c"
+#line 9979 "PhotoPage.c"
 	}
 	goto __finally250;
 	__catch250_g_error:
@@ -10014,7 +10016,7 @@ 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 10013 "PhotoPage.c"
+#line 10015 "PhotoPage.c"
 	}
 	__finally250:
 #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10027,13 +10029,13 @@ 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 10026 "PhotoPage.c"
+#line 10028 "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 10032 "PhotoPage.c"
+#line 10034 "PhotoPage.c"
 		GdkPixbuf* _tmp23_ = NULL;
 		Dimensions _tmp24_ = {0};
 #line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10042,7 +10044,7 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		_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 10041 "PhotoPage.c"
+#line 10043 "PhotoPage.c"
 	}
 #line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = editing_host_page_editing_host_canvas_new (self);
@@ -10070,42 +10072,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 10069 "PhotoPage.c"
+#line 10071 "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 10076 "PhotoPage.c"
+#line 10078 "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 10083 "PhotoPage.c"
+#line 10085 "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 10090 "PhotoPage.c"
+#line 10092 "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 10097 "PhotoPage.c"
+#line 10099 "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 10104 "PhotoPage.c"
+#line 10106 "PhotoPage.c"
 }
 
 
@@ -10114,7 +10116,7 @@ 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 10113 "PhotoPage.c"
+#line 10115 "PhotoPage.c"
 }
 
 
@@ -10158,7 +10160,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 10157 "PhotoPage.c"
+#line 10159 "PhotoPage.c"
 	}
 #line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->current_tool;
@@ -10180,7 +10182,7 @@ 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 10179 "PhotoPage.c"
+#line 10181 "PhotoPage.c"
 		EditingToolsEditingToolWindow* _tmp7_ = NULL;
 		gboolean _tmp8_ = FALSE;
 #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10189,15 +10191,15 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		_tmp8_ = editing_tools_editing_tool_window_has_user_moved (_tmp7_);
 #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp8_;
-#line 10188 "PhotoPage.c"
+#line 10190 "PhotoPage.c"
 	} else {
 #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = FALSE;
-#line 10192 "PhotoPage.c"
+#line 10194 "PhotoPage.c"
 	}
 #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 10196 "PhotoPage.c"
+#line 10198 "PhotoPage.c"
 		gint last_location_x = 0;
 		gint last_location_y = 0;
 		EditingToolsEditingToolWindow* _tmp9_ = NULL;
@@ -10255,7 +10257,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 10254 "PhotoPage.c"
+#line 10256 "PhotoPage.c"
 	}
 #line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = tool;
@@ -10305,7 +10307,7 @@ 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 10304 "PhotoPage.c"
+#line 10306 "PhotoPage.c"
 		GdkPixbuf* _tmp36_ = NULL;
 		GdkPixbuf* _tmp37_ = NULL;
 #line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10316,14 +10318,14 @@ 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 10315 "PhotoPage.c"
+#line 10317 "PhotoPage.c"
 	} else {
 		GdkPixbuf* _tmp38_ = NULL;
 #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 10322 "PhotoPage.c"
+#line 10324 "PhotoPage.c"
 			GdkPixbuf* _tmp39_ = NULL;
 			GdkPixbuf* _tmp40_ = NULL;
 			GdkPixbuf* _tmp41_ = NULL;
@@ -10344,18 +10346,18 @@ 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 10343 "PhotoPage.c"
+#line 10345 "PhotoPage.c"
 		} else {
 #line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			needs_improvement = TRUE;
-#line 10347 "PhotoPage.c"
+#line 10349 "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 10354 "PhotoPage.c"
+#line 10356 "PhotoPage.c"
 		GdkPixbuf* _tmp44_ = NULL;
 		Dimensions _tmp45_ = {0};
 #line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10364,7 +10366,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		_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 10363 "PhotoPage.c"
+#line 10365 "PhotoPage.c"
 	}
 #line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->cancel_editing_pixbuf);
@@ -10378,13 +10380,13 @@ 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 10377 "PhotoPage.c"
+#line 10379 "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 10383 "PhotoPage.c"
+#line 10385 "PhotoPage.c"
 		CommandManager* _tmp48_ = NULL;
 		CommandManager* _tmp49_ = NULL;
 		Command* _tmp50_ = NULL;
@@ -10398,7 +10400,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 10397 "PhotoPage.c"
+#line 10399 "PhotoPage.c"
 	}
 #line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (replacement);
@@ -10406,7 +10408,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 10405 "PhotoPage.c"
+#line 10407 "PhotoPage.c"
 }
 
 
@@ -10418,7 +10420,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 10417 "PhotoPage.c"
+#line 10419 "PhotoPage.c"
 }
 
 
@@ -10427,7 +10429,7 @@ 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 10426 "PhotoPage.c"
+#line 10428 "PhotoPage.c"
 }
 
 
@@ -10461,14 +10463,14 @@ 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 10460 "PhotoPage.c"
+#line 10462 "PhotoPage.c"
 		gboolean _tmp2_ = FALSE;
 		EditingToolsEditingTool* _tmp3_ = NULL;
 #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 10467 "PhotoPage.c"
+#line 10469 "PhotoPage.c"
 			GdkEventButton* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10477,17 +10479,17 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 			_tmp5_ = editing_host_page_on_double_click (self, _tmp4_);
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = _tmp5_;
-#line 10476 "PhotoPage.c"
+#line 10478 "PhotoPage.c"
 		} else {
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = FALSE;
-#line 10480 "PhotoPage.c"
+#line 10482 "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 10486 "PhotoPage.c"
+#line 10488 "PhotoPage.c"
 	}
 #line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = event;
@@ -10505,7 +10507,7 @@ 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 10504 "PhotoPage.c"
+#line 10506 "PhotoPage.c"
 		GtkScale* _tmp12_ = NULL;
 		gdouble _tmp13_ = 0.0;
 #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10514,15 +10516,15 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 		_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 10513 "PhotoPage.c"
+#line 10515 "PhotoPage.c"
 	} else {
 #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = FALSE;
-#line 10517 "PhotoPage.c"
+#line 10519 "PhotoPage.c"
 	}
 #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_) {
-#line 10521 "PhotoPage.c"
+#line 10523 "PhotoPage.c"
 		GdkEventButton* _tmp14_ = NULL;
 		gdouble _tmp15_ = 0.0;
 		GdkEventButton* _tmp16_ = NULL;
@@ -10547,7 +10549,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 10546 "PhotoPage.c"
+#line 10548 "PhotoPage.c"
 	}
 #line 1565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = self->priv->current_tool;
@@ -10557,7 +10559,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 10556 "PhotoPage.c"
+#line 10558 "PhotoPage.c"
 	}
 #line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = x;
@@ -10571,7 +10573,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 10570 "PhotoPage.c"
+#line 10572 "PhotoPage.c"
 	}
 #line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = self->priv->current_tool;
@@ -10585,7 +10587,7 @@ 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 10584 "PhotoPage.c"
+#line 10586 "PhotoPage.c"
 }
 
 
@@ -10611,7 +10613,7 @@ 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 10610 "PhotoPage.c"
+#line 10612 "PhotoPage.c"
 		GdkPoint viewport_center = {0};
 		ZoomState _tmp1_ = {0};
 		GdkPoint _tmp2_ = {0};
@@ -10698,7 +10700,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 10697 "PhotoPage.c"
+#line 10699 "PhotoPage.c"
 	}
 #line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = self->priv->current_tool;
@@ -10708,7 +10710,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 10707 "PhotoPage.c"
+#line 10709 "PhotoPage.c"
 	}
 #line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = self->priv->current_tool;
@@ -10734,7 +10736,7 @@ 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 10733 "PhotoPage.c"
+#line 10735 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp31_ = NULL;
 		EditingToolsEditingToolWindow* _tmp32_ = NULL;
 		EditingToolsEditingToolWindow* _tmp33_ = NULL;
@@ -10748,13 +10750,13 @@ 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 10747 "PhotoPage.c"
+#line 10749 "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 10753 "PhotoPage.c"
+#line 10755 "PhotoPage.c"
 }
 
 
@@ -10775,7 +10777,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 10774 "PhotoPage.c"
+#line 10776 "PhotoPage.c"
 }
 
 
@@ -10784,7 +10786,7 @@ 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 10783 "PhotoPage.c"
+#line 10785 "PhotoPage.c"
 }
 
 
@@ -10824,7 +10826,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 10823 "PhotoPage.c"
+#line 10825 "PhotoPage.c"
 	}
 #line 1617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->pixbuf_dirty = TRUE;
@@ -10842,7 +10844,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 10841 "PhotoPage.c"
+#line 10843 "PhotoPage.c"
 	}
 #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -10862,7 +10864,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 10861 "PhotoPage.c"
+#line 10863 "PhotoPage.c"
 }
 
 
@@ -10871,7 +10873,7 @@ 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 10870 "PhotoPage.c"
+#line 10872 "PhotoPage.c"
 }
 
 
@@ -10884,7 +10886,7 @@ static gboolean editing_host_page_on_fetch_original (EditingHostPage* self) {
 	_tmp0_ = editing_host_page_has_photo (self);
 #line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 10883 "PhotoPage.c"
+#line 10885 "PhotoPage.c"
 		PixbufCache* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
@@ -10898,13 +10900,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 10897 "PhotoPage.c"
+#line 10899 "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 10903 "PhotoPage.c"
+#line 10905 "PhotoPage.c"
 }
 
 
@@ -10955,7 +10957,7 @@ 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 10954 "PhotoPage.c"
+#line 10956 "PhotoPage.c"
 		Dimensions _tmp11_ = {0};
 		gint _tmp12_ = 0;
 		Dimensions _tmp13_ = {0};
@@ -10970,17 +10972,17 @@ 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 10969 "PhotoPage.c"
+#line 10971 "PhotoPage.c"
 	} else {
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = FALSE;
-#line 10973 "PhotoPage.c"
+#line 10975 "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 10979 "PhotoPage.c"
+#line 10981 "PhotoPage.c"
 }
 
 
@@ -10994,11 +10996,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 10993 "PhotoPage.c"
+#line 10995 "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 10997 "PhotoPage.c"
+#line 10999 "PhotoPage.c"
 	}
 }
 
@@ -11021,7 +11023,7 @@ 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 11020 "PhotoPage.c"
+#line 11022 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
@@ -11045,7 +11047,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 11044 "PhotoPage.c"
+#line 11046 "PhotoPage.c"
 	}
 #line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
@@ -11053,7 +11055,7 @@ 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 11052 "PhotoPage.c"
+#line 11054 "PhotoPage.c"
 		gint delta_x = 0;
 		GdkEventMotion* _tmp7_ = NULL;
 		gdouble _tmp8_ = 0.0;
@@ -11127,7 +11129,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 11126 "PhotoPage.c"
+#line 11128 "PhotoPage.c"
 	}
 #line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = event;
@@ -11143,7 +11145,7 @@ 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 11142 "PhotoPage.c"
+#line 11144 "PhotoPage.c"
 }
 
 
@@ -11158,7 +11160,7 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) {
 	_tmp0_ = self->priv->current_tool;
 #line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11157 "PhotoPage.c"
+#line 11159 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
 #line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11169,7 +11171,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 11168 "PhotoPage.c"
+#line 11170 "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));
@@ -11177,7 +11179,7 @@ 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 11176 "PhotoPage.c"
+#line 11178 "PhotoPage.c"
 }
 
 
@@ -11189,7 +11191,7 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) {
 	_tmp0_ = self->priv->current_tool;
 #line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11188 "PhotoPage.c"
+#line 11190 "PhotoPage.c"
 		EditingToolsEditingToolWindow* tool_window = NULL;
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		EditingToolsEditingToolWindow* _tmp2_ = NULL;
@@ -11205,7 +11207,7 @@ 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 11204 "PhotoPage.c"
+#line 11206 "PhotoPage.c"
 			EditingToolsEditingToolWindow* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
 #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11214,21 +11216,21 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) {
 			_tmp6_ = editing_tools_editing_tool_window_has_user_moved (_tmp5_);
 #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = !_tmp6_;
-#line 11213 "PhotoPage.c"
+#line 11215 "PhotoPage.c"
 		} else {
 #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = FALSE;
-#line 11217 "PhotoPage.c"
+#line 11219 "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 11223 "PhotoPage.c"
+#line 11225 "PhotoPage.c"
 		}
 #line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (tool_window);
-#line 11227 "PhotoPage.c"
+#line 11229 "PhotoPage.c"
 	}
 }
 
@@ -11246,7 +11248,7 @@ 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 11245 "PhotoPage.c"
+#line 11247 "PhotoPage.c"
 }
 
 
@@ -11266,7 +11268,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 11265 "PhotoPage.c"
+#line 11267 "PhotoPage.c"
 }
 
 
@@ -11305,7 +11307,7 @@ 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 11304 "PhotoPage.c"
+#line 11306 "PhotoPage.c"
 	ZoomState new_zoom_state = {0};
 	ZoomState _tmp12_ = {0};
 	GdkPoint _tmp13_ = {0};
@@ -11336,7 +11338,7 @@ 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 11335 "PhotoPage.c"
+#line 11337 "PhotoPage.c"
 			default:
 			{
 				gint _tmp8_ = 0;
@@ -11346,13 +11348,13 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 				viewport_center.x = _tmp8_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11345 "PhotoPage.c"
+#line 11347 "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 11351 "PhotoPage.c"
+#line 11353 "PhotoPage.c"
 			default:
 			{
 				gint _tmp9_ = 0;
@@ -11362,13 +11364,13 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 				viewport_center.x = _tmp9_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11361 "PhotoPage.c"
+#line 11363 "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 11367 "PhotoPage.c"
+#line 11369 "PhotoPage.c"
 			default:
 			{
 				gint _tmp10_ = 0;
@@ -11378,13 +11380,13 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 				viewport_center.y = _tmp10_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11377 "PhotoPage.c"
+#line 11379 "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 11383 "PhotoPage.c"
+#line 11385 "PhotoPage.c"
 			default:
 			{
 				gint _tmp11_ = 0;
@@ -11394,20 +11396,20 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 				viewport_center.y = _tmp11_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11393 "PhotoPage.c"
+#line 11395 "PhotoPage.c"
 			}
 		}
 	} else {
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11399 "PhotoPage.c"
+#line 11401 "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 11406 "PhotoPage.c"
+#line 11408 "PhotoPage.c"
 			}
 		}
 	}
@@ -11427,7 +11429,7 @@ 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 11426 "PhotoPage.c"
+#line 11428 "PhotoPage.c"
 }
 
 
@@ -11460,7 +11462,7 @@ 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 11459 "PhotoPage.c"
+#line 11461 "PhotoPage.c"
 	gboolean _tmp15_ = FALSE;
 	gboolean _tmp16_ = FALSE;
 #line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11471,7 +11473,7 @@ 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 11470 "PhotoPage.c"
+#line 11472 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		GdkEventKey* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
@@ -11487,14 +11489,14 @@ 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 11486 "PhotoPage.c"
+#line 11488 "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 11493 "PhotoPage.c"
+#line 11495 "PhotoPage.c"
 		GdkEventKey* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
 #line 1763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11507,7 +11509,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 11506 "PhotoPage.c"
+#line 11508 "PhotoPage.c"
 		}
 	}
 #line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11520,7 +11522,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 11519 "PhotoPage.c"
+#line 11521 "PhotoPage.c"
 	}
 #line 1773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	handled = TRUE;
@@ -11538,51 +11540,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 11537 "PhotoPage.c"
+#line 11539 "PhotoPage.c"
 			default:
 			{
 #line 1780 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11542 "PhotoPage.c"
+#line 11544 "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 11548 "PhotoPage.c"
+#line 11550 "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 11555 "PhotoPage.c"
+#line 11557 "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 11561 "PhotoPage.c"
+#line 11563 "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 11568 "PhotoPage.c"
+#line 11570 "PhotoPage.c"
 			}
 		}
 	} else {
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11574 "PhotoPage.c"
+#line 11576 "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 11581 "PhotoPage.c"
+#line 11583 "PhotoPage.c"
 			}
 		}
 	}
@@ -11594,11 +11596,11 @@ 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 11593 "PhotoPage.c"
+#line 11595 "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 11597 "PhotoPage.c"
+#line 11599 "PhotoPage.c"
 		GdkEventKey* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
 #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11607,17 +11609,17 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 		_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 11606 "PhotoPage.c"
+#line 11608 "PhotoPage.c"
 	} else {
 #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = TRUE;
-#line 11610 "PhotoPage.c"
+#line 11612 "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 11616 "PhotoPage.c"
+#line 11618 "PhotoPage.c"
 }
 
 
@@ -11634,7 +11636,7 @@ 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 11633 "PhotoPage.c"
+#line 11635 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		EditingToolsPhotoCanvas* _tmp2_ = NULL;
 		cairo_t* _tmp3_ = NULL;
@@ -11649,7 +11651,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 11648 "PhotoPage.c"
+#line 11650 "PhotoPage.c"
 	}
 }
 
@@ -11668,21 +11670,21 @@ 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 11667 "PhotoPage.c"
+#line 11669 "PhotoPage.c"
 		SinglePhotoPageUpdateReason _tmp2_ = 0;
 #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 11673 "PhotoPage.c"
+#line 11675 "PhotoPage.c"
 	} else {
 #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 11677 "PhotoPage.c"
+#line 11679 "PhotoPage.c"
 	}
 #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 11681 "PhotoPage.c"
+#line 11683 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp3_ = NULL;
 		EditingToolsPhotoCanvas* _tmp4_ = NULL;
 		Dimensions _tmp5_ = {0};
@@ -11704,7 +11706,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 11703 "PhotoPage.c"
+#line 11705 "PhotoPage.c"
 	}
 }
 
@@ -11715,7 +11717,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 11714 "PhotoPage.c"
+#line 11716 "PhotoPage.c"
 }
 
 
@@ -11724,7 +11726,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 11723 "PhotoPage.c"
+#line 11725 "PhotoPage.c"
 }
 
 
@@ -11734,7 +11736,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 11733 "PhotoPage.c"
+#line 11735 "PhotoPage.c"
 }
 
 
@@ -11743,7 +11745,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 11742 "PhotoPage.c"
+#line 11744 "PhotoPage.c"
 }
 
 
@@ -11753,7 +11755,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 11752 "PhotoPage.c"
+#line 11754 "PhotoPage.c"
 }
 
 
@@ -11762,7 +11764,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 11761 "PhotoPage.c"
+#line 11763 "PhotoPage.c"
 }
 
 
@@ -11772,7 +11774,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 11771 "PhotoPage.c"
+#line 11773 "PhotoPage.c"
 }
 
 
@@ -11781,7 +11783,7 @@ 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 11780 "PhotoPage.c"
+#line 11782 "PhotoPage.c"
 }
 
 
@@ -11815,7 +11817,7 @@ 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 11814 "PhotoPage.c"
+#line 11816 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		cairo_t* _tmp2_ = NULL;
 #line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11826,27 +11828,27 @@ 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 11825 "PhotoPage.c"
+#line 11827 "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 11831 "PhotoPage.c"
+#line 11833 "PhotoPage.c"
 		gboolean _tmp5_ = FALSE;
 #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 11837 "PhotoPage.c"
+#line 11839 "PhotoPage.c"
 	} else {
 #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = FALSE;
-#line 11841 "PhotoPage.c"
+#line 11843 "PhotoPage.c"
 	}
 #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 11845 "PhotoPage.c"
+#line 11847 "PhotoPage.c"
 		cairo_t* _tmp6_ = NULL;
 		cairo_t* _tmp7_ = NULL;
 		Dimensions _tmp8_ = {0};
@@ -11918,7 +11920,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		_g_object_unref0 (_tmp16_);
 #line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11917 "PhotoPage.c"
+#line 11919 "PhotoPage.c"
 	}
 #line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = ctx;
@@ -11934,7 +11936,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	if (!_tmp26_) {
 #line 1857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11933 "PhotoPage.c"
+#line 11935 "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_);
@@ -11948,7 +11950,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	_tmp29_ = trinket;
 #line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp29_ != NULL) {
-#line 11947 "PhotoPage.c"
+#line 11949 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp30_ = {0};
 		gint _tmp31_ = 0;
@@ -12030,7 +12032,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		_tmp52_ = ctx;
 #line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp52_);
-#line 12029 "PhotoPage.c"
+#line 12031 "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);
@@ -12042,7 +12044,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	_tmp54_ = trinket;
 #line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp54_ != NULL) {
-#line 12041 "PhotoPage.c"
+#line 12043 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp55_ = {0};
 		gint _tmp56_ = 0;
@@ -12109,7 +12111,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		_tmp72_ = ctx;
 #line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp72_);
-#line 12108 "PhotoPage.c"
+#line 12110 "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);
@@ -12121,7 +12123,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	_tmp74_ = trinket;
 #line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp74_ != NULL) {
-#line 12120 "PhotoPage.c"
+#line 12122 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp75_ = {0};
 		gint _tmp76_ = 0;
@@ -12203,7 +12205,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		_tmp97_ = ctx;
 #line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp97_);
-#line 12202 "PhotoPage.c"
+#line 12204 "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);
@@ -12215,7 +12217,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	_tmp99_ = trinket;
 #line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp99_ != NULL) {
-#line 12214 "PhotoPage.c"
+#line 12216 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp100_ = {0};
 		gint _tmp101_ = 0;
@@ -12312,11 +12314,11 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		_tmp127_ = ctx;
 #line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp127_);
-#line 12311 "PhotoPage.c"
+#line 12313 "PhotoPage.c"
 	}
 #line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
-#line 12315 "PhotoPage.c"
+#line 12317 "PhotoPage.c"
 }
 
 
@@ -12333,7 +12335,7 @@ 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 12332 "PhotoPage.c"
+#line 12334 "PhotoPage.c"
 }
 
 
@@ -12369,7 +12371,7 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation,
 	if (!_tmp1_) {
 #line 1909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12368 "PhotoPage.c"
+#line 12370 "PhotoPage.c"
 	}
 #line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
@@ -12401,7 +12403,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 12400 "PhotoPage.c"
+#line 12402 "PhotoPage.c"
 }
 
 
@@ -12410,7 +12412,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 12409 "PhotoPage.c"
+#line 12411 "PhotoPage.c"
 }
 
 
@@ -12419,7 +12421,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 12418 "PhotoPage.c"
+#line 12420 "PhotoPage.c"
 }
 
 
@@ -12428,7 +12430,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 12427 "PhotoPage.c"
+#line 12429 "PhotoPage.c"
 }
 
 
@@ -12437,7 +12439,7 @@ 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 12436 "PhotoPage.c"
+#line 12438 "PhotoPage.c"
 }
 
 
@@ -12465,7 +12467,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	if (_tmp0_) {
 #line 1934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12464 "PhotoPage.c"
+#line 12466 "PhotoPage.c"
 	}
 #line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp1_, 0, 0);
@@ -12477,7 +12479,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	if (!_tmp2_) {
 #line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12476 "PhotoPage.c"
+#line 12478 "PhotoPage.c"
 	}
 #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (self);
@@ -12491,7 +12493,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	_g_object_unref0 (_tmp4_);
 #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 12490 "PhotoPage.c"
+#line 12492 "PhotoPage.c"
 		AppWindow* _tmp7_ = NULL;
 		AppWindow* _tmp8_ = NULL;
 		ViewCollection* _tmp9_ = NULL;
@@ -12528,7 +12530,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 		if (_tmp14_) {
 #line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 12527 "PhotoPage.c"
+#line 12529 "PhotoPage.c"
 		}
 #line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = editing_host_page_get_photo (self);
@@ -12538,7 +12540,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 12537 "PhotoPage.c"
+#line 12539 "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));
@@ -12568,7 +12570,7 @@ 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 12567 "PhotoPage.c"
+#line 12569 "PhotoPage.c"
 }
 
 
@@ -12606,7 +12608,7 @@ 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 12605 "PhotoPage.c"
+#line 12607 "PhotoPage.c"
 		Photo* _tmp3_ = NULL;
 		LibraryPhoto* _tmp4_ = NULL;
 #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12617,19 +12619,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 12616 "PhotoPage.c"
+#line 12618 "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 12622 "PhotoPage.c"
+#line 12624 "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 12628 "PhotoPage.c"
+#line 12630 "PhotoPage.c"
 	}
 #line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = item;
@@ -12663,7 +12665,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 12662 "PhotoPage.c"
+#line 12664 "PhotoPage.c"
 	}
 #line 1970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = item;
@@ -12691,7 +12693,7 @@ 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 12690 "PhotoPage.c"
+#line 12692 "PhotoPage.c"
 }
 
 
@@ -12729,7 +12731,7 @@ 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 12728 "PhotoPage.c"
+#line 12730 "PhotoPage.c"
 		Photo* _tmp3_ = NULL;
 		LibraryPhoto* _tmp4_ = NULL;
 #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12740,19 +12742,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 12739 "PhotoPage.c"
+#line 12741 "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 12745 "PhotoPage.c"
+#line 12747 "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 12751 "PhotoPage.c"
+#line 12753 "PhotoPage.c"
 	}
 #line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = item;
@@ -12786,7 +12788,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 12785 "PhotoPage.c"
+#line 12787 "PhotoPage.c"
 	}
 #line 1986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = item;
@@ -12814,7 +12816,7 @@ 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 12813 "PhotoPage.c"
+#line 12815 "PhotoPage.c"
 }
 
 
@@ -12841,7 +12843,7 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
 	if (!_tmp0_) {
 #line 1992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12840 "PhotoPage.c"
+#line 12842 "PhotoPage.c"
 	}
 #line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
@@ -12869,7 +12871,7 @@ 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 12868 "PhotoPage.c"
+#line 12870 "PhotoPage.c"
 		ViewCollection* _tmp10_ = NULL;
 		ViewCollection* _tmp11_ = NULL;
 		GeeList* _tmp12_ = NULL;
@@ -12924,11 +12926,11 @@ 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 12923 "PhotoPage.c"
+#line 12925 "PhotoPage.c"
 	}
 #line 1990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (dialog);
-#line 12927 "PhotoPage.c"
+#line 12929 "PhotoPage.c"
 }
 
 
@@ -12940,7 +12942,7 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
 	_tmp0_ = editing_host_page_has_photo (self);
 #line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 12939 "PhotoPage.c"
+#line 12941 "PhotoPage.c"
 		SetBackgroundPhotoDialog* dialog = NULL;
 		SetBackgroundPhotoDialog* _tmp1_ = NULL;
 		gboolean desktop = FALSE;
@@ -12965,7 +12967,7 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
 		screensaver = _tmp4_;
 #line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_) {
-#line 12964 "PhotoPage.c"
+#line 12966 "PhotoPage.c"
 			AppWindow* _tmp6_ = NULL;
 			AppWindow* _tmp7_ = NULL;
 			Photo* _tmp8_ = NULL;
@@ -13002,11 +13004,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 13001 "PhotoPage.c"
+#line 13003 "PhotoPage.c"
 		}
 #line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (dialog);
-#line 13005 "PhotoPage.c"
+#line 13007 "PhotoPage.c"
 	}
 }
 
@@ -13014,7 +13016,7 @@ 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 13013 "PhotoPage.c"
+#line 13015 "PhotoPage.c"
 }
 
 
@@ -13060,7 +13062,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 13059 "PhotoPage.c"
+#line 13061 "PhotoPage.c"
 	}
 #line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = event;
@@ -13070,7 +13072,7 @@ 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 13069 "PhotoPage.c"
+#line 13071 "PhotoPage.c"
 }
 
 
@@ -13116,37 +13118,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 13115 "PhotoPage.c"
+#line 13117 "PhotoPage.c"
 		gboolean _tmp9_ = FALSE;
 #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 13121 "PhotoPage.c"
+#line 13123 "PhotoPage.c"
 	} else {
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = FALSE;
-#line 13125 "PhotoPage.c"
+#line 13127 "PhotoPage.c"
 	}
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp7_) {
-#line 13129 "PhotoPage.c"
+#line 13131 "PhotoPage.c"
 		gboolean _tmp10_ = FALSE;
 #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 13135 "PhotoPage.c"
+#line 13137 "PhotoPage.c"
 	} else {
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = FALSE;
-#line 13139 "PhotoPage.c"
+#line 13141 "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 13145 "PhotoPage.c"
+#line 13147 "PhotoPage.c"
 	}
 #line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = event;
@@ -13156,7 +13158,7 @@ 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 13155 "PhotoPage.c"
+#line 13157 "PhotoPage.c"
 }
 
 
@@ -13191,7 +13193,7 @@ 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 13190 "PhotoPage.c"
+#line 13192 "PhotoPage.c"
 		GtkToggleToolButton* _tmp4_ = NULL;
 		GtkToggleToolButton* _tmp5_ = NULL;
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13200,11 +13202,11 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT
 		_tmp5_ = toggle;
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp4_ == _tmp5_;
-#line 13199 "PhotoPage.c"
+#line 13201 "PhotoPage.c"
 	} else {
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 13203 "PhotoPage.c"
+#line 13205 "PhotoPage.c"
 	}
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	deactivating_only = _tmp0_;
@@ -13220,7 +13222,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 13219 "PhotoPage.c"
+#line 13221 "PhotoPage.c"
 	}
 #line 2056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -13264,7 +13266,7 @@ 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 13263 "PhotoPage.c"
+#line 13265 "PhotoPage.c"
 }
 
 
@@ -13286,7 +13288,7 @@ 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 13285 "PhotoPage.c"
+#line 13287 "PhotoPage.c"
 }
 
 
@@ -13308,7 +13310,7 @@ 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 13307 "PhotoPage.c"
+#line 13309 "PhotoPage.c"
 }
 
 
@@ -13335,7 +13337,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 13334 "PhotoPage.c"
+#line 13336 "PhotoPage.c"
 }
 
 
@@ -13351,7 +13353,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 13350 "PhotoPage.c"
+#line 13352 "PhotoPage.c"
 }
 
 
@@ -13365,7 +13367,7 @@ 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 13364 "PhotoPage.c"
+#line 13366 "PhotoPage.c"
 }
 
 
@@ -13383,7 +13385,7 @@ 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 13382 "PhotoPage.c"
+#line 13384 "PhotoPage.c"
 }
 
 
@@ -13401,7 +13403,7 @@ 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 13400 "PhotoPage.c"
+#line 13402 "PhotoPage.c"
 }
 
 
@@ -13419,7 +13421,7 @@ 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 13418 "PhotoPage.c"
+#line 13420 "PhotoPage.c"
 }
 
 
@@ -13437,7 +13439,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 13436 "PhotoPage.c"
+#line 13438 "PhotoPage.c"
 }
 
 
@@ -13446,7 +13448,7 @@ 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 13445 "PhotoPage.c"
+#line 13447 "PhotoPage.c"
 }
 
 
@@ -13458,7 +13460,7 @@ static void editing_host_page_on_straighten_toggled (EditingHostPage* self) {
 	_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 13457 "PhotoPage.c"
+#line 13459 "PhotoPage.c"
 }
 
 
@@ -13467,7 +13469,7 @@ 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 13466 "PhotoPage.c"
+#line 13468 "PhotoPage.c"
 }
 
 
@@ -13479,7 +13481,7 @@ static void editing_host_page_on_crop_toggled (EditingHostPage* self) {
 	_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 13478 "PhotoPage.c"
+#line 13480 "PhotoPage.c"
 }
 
 
@@ -13488,7 +13490,7 @@ 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 13487 "PhotoPage.c"
+#line 13489 "PhotoPage.c"
 }
 
 
@@ -13500,7 +13502,7 @@ static void editing_host_page_on_redeye_toggled (EditingHostPage* self) {
 	_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 13499 "PhotoPage.c"
+#line 13501 "PhotoPage.c"
 }
 
 
@@ -13509,7 +13511,7 @@ 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 13508 "PhotoPage.c"
+#line 13510 "PhotoPage.c"
 }
 
 
@@ -13521,7 +13523,7 @@ static void editing_host_page_on_adjust_toggled (EditingHostPage* self) {
 	_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 13520 "PhotoPage.c"
+#line 13522 "PhotoPage.c"
 }
 
 
@@ -13538,7 +13540,7 @@ 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 13537 "PhotoPage.c"
+#line 13539 "PhotoPage.c"
 }
 
 
@@ -13563,7 +13565,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 	_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 13562 "PhotoPage.c"
+#line 13564 "PhotoPage.c"
 		Dimensions _tmp1_ = {0};
 #line 2141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		dimensions_init (&_tmp1_, 0, 0);
@@ -13571,7 +13573,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 13570 "PhotoPage.c"
+#line 13572 "PhotoPage.c"
 	}
 #line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_has_photo (self);
@@ -13579,7 +13581,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 	if (!_tmp2_) {
 #line 2147 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13578 "PhotoPage.c"
+#line 13580 "PhotoPage.c"
 	}
 #line 2149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->current_tool;
@@ -13591,7 +13593,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 	_tmp5_ = adjust_tool;
 #line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 13590 "PhotoPage.c"
+#line 13592 "PhotoPage.c"
 		EditingToolsAdjustTool* _tmp6_ = NULL;
 #line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = adjust_tool;
@@ -13601,7 +13603,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 13600 "PhotoPage.c"
+#line 13602 "PhotoPage.c"
 	}
 #line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = editing_host_page_get_photo (self);
@@ -13629,7 +13631,7 @@ 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 13628 "PhotoPage.c"
+#line 13630 "PhotoPage.c"
 }
 
 
@@ -13647,7 +13649,7 @@ void editing_host_page_on_copy_adjustments (EditingHostPage* self) {
 	if (!_tmp0_) {
 #line 2162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13646 "PhotoPage.c"
+#line 13648 "PhotoPage.c"
 	}
 #line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
@@ -13665,7 +13667,7 @@ 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 13664 "PhotoPage.c"
+#line 13666 "PhotoPage.c"
 }
 
 
@@ -13695,14 +13697,14 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
 	if (!_tmp2_) {
 #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = TRUE;
-#line 13694 "PhotoPage.c"
+#line 13696 "PhotoPage.c"
 	} else {
 		PixelTransformationBundle* _tmp3_ = NULL;
 #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 13701 "PhotoPage.c"
+#line 13703 "PhotoPage.c"
 	}
 #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
@@ -13710,7 +13712,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 13709 "PhotoPage.c"
+#line 13711 "PhotoPage.c"
 	}
 #line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_get_photo (self);
@@ -13740,7 +13742,7 @@ 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 13739 "PhotoPage.c"
+#line 13741 "PhotoPage.c"
 }
 
 
@@ -13798,7 +13800,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 13797 "PhotoPage.c"
+#line 13799 "PhotoPage.c"
 	}
 #line 2181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->current_tool;
@@ -13814,7 +13816,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 13813 "PhotoPage.c"
+#line 13815 "PhotoPage.c"
 	}
 #line 2186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = tool_window;
@@ -13858,7 +13860,7 @@ 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 13857 "PhotoPage.c"
+#line 13859 "PhotoPage.c"
 		GeeHashMap* _tmp18_ = NULL;
 		EditingToolsEditingTool* _tmp19_ = NULL;
 		const gchar* _tmp20_ = NULL;
@@ -13903,7 +13905,7 @@ 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 13902 "PhotoPage.c"
+#line 13904 "PhotoPage.c"
 	} else {
 		GtkWindow* _tmp30_ = NULL;
 		GtkWindow* _tmp31_ = NULL;
@@ -13926,7 +13928,7 @@ 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 13925 "PhotoPage.c"
+#line 13927 "PhotoPage.c"
 			gint rx = 0;
 			gint ry = 0;
 			GtkWindow* _tmp35_ = NULL;
@@ -14001,7 +14003,7 @@ 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 14000 "PhotoPage.c"
+#line 14002 "PhotoPage.c"
 				gint _tmp51_ = 0;
 				gint _tmp52_ = 0;
 				gint _tmp53_ = 0;
@@ -14019,7 +14021,7 @@ 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 14018 "PhotoPage.c"
+#line 14020 "PhotoPage.c"
 			} else {
 				gint _tmp56_ = 0;
 				gint _tmp57_ = 0;
@@ -14032,7 +14034,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 14031 "PhotoPage.c"
+#line 14033 "PhotoPage.c"
 			}
 #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			x = _tmp50_;
@@ -14048,7 +14050,7 @@ 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 14047 "PhotoPage.c"
+#line 14049 "PhotoPage.c"
 		} else {
 			GtkWindow* _tmp64_ = NULL;
 			GtkWindow* _tmp65_ = NULL;
@@ -14127,13 +14129,13 @@ 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 14126 "PhotoPage.c"
+#line 14128 "PhotoPage.c"
 				gint _tmp83_ = 0;
 #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 14132 "PhotoPage.c"
+#line 14134 "PhotoPage.c"
 			} else {
 				gint _tmp84_ = 0;
 				GtkAllocation _tmp85_ = {0};
@@ -14146,11 +14148,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 14145 "PhotoPage.c"
+#line 14147 "PhotoPage.c"
 			}
 #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (screen);
-#line 14149 "PhotoPage.c"
+#line 14151 "PhotoPage.c"
 		}
 	}
 #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14215,7 +14217,7 @@ 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 14214 "PhotoPage.c"
+#line 14216 "PhotoPage.c"
 }
 
 
@@ -14249,7 +14251,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 14248 "PhotoPage.c"
+#line 14250 "PhotoPage.c"
 	}
 #line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
@@ -14287,7 +14289,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 14286 "PhotoPage.c"
+#line 14288 "PhotoPage.c"
 	}
 #line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = current;
@@ -14295,14 +14297,14 @@ 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 14294 "PhotoPage.c"
+#line 14296 "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 14301 "PhotoPage.c"
+#line 14303 "PhotoPage.c"
 			ViewCollection* _tmp14_ = NULL;
 			ViewCollection* _tmp15_ = NULL;
 			DataView* _tmp16_ = NULL;
@@ -14318,7 +14320,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 			Photo* _tmp25_ = NULL;
 #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp13_) {
-#line 14317 "PhotoPage.c"
+#line 14319 "PhotoPage.c"
 			}
 #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = FALSE;
@@ -14342,7 +14344,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 14341 "PhotoPage.c"
+#line 14343 "PhotoPage.c"
 			}
 #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = next;
@@ -14354,7 +14356,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 14353 "PhotoPage.c"
+#line 14355 "PhotoPage.c"
 			}
 #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			next_photo = _tmp21_;
@@ -14366,7 +14368,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 14365 "PhotoPage.c"
+#line 14367 "PhotoPage.c"
 			}
 #line 2277 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = next_photo;
@@ -14378,7 +14380,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 14377 "PhotoPage.c"
+#line 14379 "PhotoPage.c"
 			}
 #line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp25_ = next_photo;
@@ -14388,7 +14390,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 14387 "PhotoPage.c"
+#line 14389 "PhotoPage.c"
 		}
 	}
 #line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14397,7 +14399,7 @@ 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 14396 "PhotoPage.c"
+#line 14398 "PhotoPage.c"
 }
 
 
@@ -14431,7 +14433,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 14430 "PhotoPage.c"
+#line 14432 "PhotoPage.c"
 	}
 #line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
@@ -14469,7 +14471,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 14468 "PhotoPage.c"
+#line 14470 "PhotoPage.c"
 	}
 #line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = current;
@@ -14477,14 +14479,14 @@ 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 14476 "PhotoPage.c"
+#line 14478 "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 14483 "PhotoPage.c"
+#line 14485 "PhotoPage.c"
 			ViewCollection* _tmp14_ = NULL;
 			ViewCollection* _tmp15_ = NULL;
 			DataView* _tmp16_ = NULL;
@@ -14500,7 +14502,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 			Photo* _tmp25_ = NULL;
 #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp13_) {
-#line 14499 "PhotoPage.c"
+#line 14501 "PhotoPage.c"
 			}
 #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = FALSE;
@@ -14524,7 +14526,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 14523 "PhotoPage.c"
+#line 14525 "PhotoPage.c"
 			}
 #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = previous;
@@ -14536,7 +14538,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 14535 "PhotoPage.c"
+#line 14537 "PhotoPage.c"
 			}
 #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			previous_photo = _tmp21_;
@@ -14548,7 +14550,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 14547 "PhotoPage.c"
+#line 14549 "PhotoPage.c"
 			}
 #line 2310 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = previous_photo;
@@ -14560,7 +14562,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 14559 "PhotoPage.c"
+#line 14561 "PhotoPage.c"
 			}
 #line 2313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp25_ = previous_photo;
@@ -14570,7 +14572,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 14569 "PhotoPage.c"
+#line 14571 "PhotoPage.c"
 		}
 	}
 #line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14579,7 +14581,7 @@ 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 14578 "PhotoPage.c"
+#line 14580 "PhotoPage.c"
 }
 
 
@@ -14594,7 +14596,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 14593 "PhotoPage.c"
+#line 14595 "PhotoPage.c"
 }
 
 
@@ -14605,7 +14607,7 @@ 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 14604 "PhotoPage.c"
+#line 14606 "PhotoPage.c"
 }
 
 
@@ -14692,14 +14694,14 @@ 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 14691 "PhotoPage.c"
+#line 14693 "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 14698 "PhotoPage.c"
+#line 14700 "PhotoPage.c"
 }
 
 
@@ -14712,7 +14714,7 @@ static void editing_host_page_editing_host_canvas_real_repaint (EditingToolsPhot
 	_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 14711 "PhotoPage.c"
+#line 14713 "PhotoPage.c"
 }
 
 
@@ -14724,15 +14726,15 @@ 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 = editing_host_page_editing_host_canvas_real_repaint;
-#line 14724 "PhotoPage.c"
+	((EditingToolsPhotoCanvasClass *) klass)->repaint = (void (*)(EditingToolsPhotoCanvas*)) editing_host_page_editing_host_canvas_real_repaint;
+#line 14726 "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 14731 "PhotoPage.c"
+#line 14733 "PhotoPage.c"
 }
 
 
@@ -14744,7 +14746,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 14743 "PhotoPage.c"
+#line 14745 "PhotoPage.c"
 }
 
 
@@ -14766,104 +14768,104 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 14862 "PhotoPage.c"
+#line 14864 "PhotoPage.c"
 }
 
 
@@ -14928,10 +14930,10 @@ static void editing_host_page_instance_init (EditingHostPage * self) {
 #line 414 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->zoom_buffer = NULL;
 #line 415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_INT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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 14930 "PhotoPage.c"
+#line 14932 "PhotoPage.c"
 }
 
 
@@ -15015,7 +15017,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 15014 "PhotoPage.c"
+#line 15016 "PhotoPage.c"
 }
 
 
@@ -15034,364 +15036,364 @@ 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 15033 "PhotoPage.c"
+#line 15035 "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 15040 "PhotoPage.c"
+#line 15042 "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 15047 "PhotoPage.c"
+#line 15049 "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 15054 "PhotoPage.c"
+#line 15056 "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 15061 "PhotoPage.c"
+#line 15063 "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 15068 "PhotoPage.c"
+#line 15070 "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 15075 "PhotoPage.c"
+#line 15077 "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 15082 "PhotoPage.c"
+#line 15084 "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 15089 "PhotoPage.c"
+#line 15091 "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 15096 "PhotoPage.c"
+#line 15098 "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 15103 "PhotoPage.c"
+#line 15105 "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 15110 "PhotoPage.c"
+#line 15112 "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 15117 "PhotoPage.c"
+#line 15119 "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 15124 "PhotoPage.c"
+#line 15126 "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 15131 "PhotoPage.c"
+#line 15133 "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 15138 "PhotoPage.c"
+#line 15140 "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 15145 "PhotoPage.c"
+#line 15147 "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 15152 "PhotoPage.c"
+#line 15154 "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 15159 "PhotoPage.c"
+#line 15161 "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 15166 "PhotoPage.c"
+#line 15168 "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 15173 "PhotoPage.c"
+#line 15175 "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 15180 "PhotoPage.c"
+#line 15182 "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 15187 "PhotoPage.c"
+#line 15189 "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 15194 "PhotoPage.c"
+#line 15196 "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 15201 "PhotoPage.c"
+#line 15203 "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 15208 "PhotoPage.c"
+#line 15210 "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 15215 "PhotoPage.c"
+#line 15217 "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 15222 "PhotoPage.c"
+#line 15224 "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 15229 "PhotoPage.c"
+#line 15231 "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 15236 "PhotoPage.c"
+#line 15238 "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 15243 "PhotoPage.c"
+#line 15245 "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 15250 "PhotoPage.c"
+#line 15252 "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 15257 "PhotoPage.c"
+#line 15259 "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 15264 "PhotoPage.c"
+#line 15266 "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 15271 "PhotoPage.c"
+#line 15273 "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 15278 "PhotoPage.c"
+#line 15280 "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 15285 "PhotoPage.c"
+#line 15287 "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 15292 "PhotoPage.c"
+#line 15294 "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 15299 "PhotoPage.c"
+#line 15301 "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 15306 "PhotoPage.c"
+#line 15308 "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 15313 "PhotoPage.c"
+#line 15315 "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 15320 "PhotoPage.c"
+#line 15322 "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 15327 "PhotoPage.c"
+#line 15329 "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 15334 "PhotoPage.c"
+#line 15336 "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 15341 "PhotoPage.c"
+#line 15343 "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 15348 "PhotoPage.c"
+#line 15350 "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 15355 "PhotoPage.c"
+#line 15357 "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 15362 "PhotoPage.c"
+#line 15364 "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 15369 "PhotoPage.c"
+#line 15371 "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 15376 "PhotoPage.c"
+#line 15378 "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 15383 "PhotoPage.c"
+#line 15385 "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 15390 "PhotoPage.c"
+#line 15392 "PhotoPage.c"
 }
 
 
@@ -15457,14 +15459,14 @@ 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 15456 "PhotoPage.c"
+#line 15458 "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 15463 "PhotoPage.c"
+#line 15465 "PhotoPage.c"
 }
 
 
@@ -15495,7 +15497,7 @@ 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 15494 "PhotoPage.c"
+#line 15496 "PhotoPage.c"
 }
 
 
@@ -15509,7 +15511,7 @@ 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 15508 "PhotoPage.c"
+#line 15510 "PhotoPage.c"
 }
 
 
@@ -15523,7 +15525,7 @@ 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 15522 "PhotoPage.c"
+#line 15524 "PhotoPage.c"
 }
 
 
@@ -15548,28 +15550,28 @@ 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 15547 "PhotoPage.c"
+#line 15549 "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 15554 "PhotoPage.c"
+#line 15556 "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 15561 "PhotoPage.c"
+#line 15563 "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 15568 "PhotoPage.c"
+#line 15570 "PhotoPage.c"
 }
 
 
@@ -15617,7 +15619,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 15616 "PhotoPage.c"
+#line 15618 "PhotoPage.c"
 	}
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
@@ -15655,11 +15657,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 15654 "PhotoPage.c"
+#line 15656 "PhotoPage.c"
 	} else {
 #line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = "Camera";
-#line 15658 "PhotoPage.c"
+#line 15660 "PhotoPage.c"
 	}
 #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = G_VARIANT_TYPE_STRING;
@@ -15683,7 +15685,7 @@ 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 15682 "PhotoPage.c"
+#line 15684 "PhotoPage.c"
 }
 
 
@@ -15698,7 +15700,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 15697 "PhotoPage.c"
+#line 15699 "PhotoPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -15710,11 +15712,11 @@ 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 15709 "PhotoPage.c"
+#line 15711 "PhotoPage.c"
 			GActionEntry entry = {0};
 #line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			entry = entry_collection[entry_it];
-#line 15713 "PhotoPage.c"
+#line 15715 "PhotoPage.c"
 			{
 				GActionMap* _tmp1_ = NULL;
 				GActionEntry _tmp2_ = {0};
@@ -15727,7 +15729,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 15726 "PhotoPage.c"
+#line 15728 "PhotoPage.c"
 			}
 		}
 	}
@@ -15737,7 +15739,7 @@ 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 15736 "PhotoPage.c"
+#line 15738 "PhotoPage.c"
 }
 
 
@@ -15748,13 +15750,13 @@ static void _vala_array_add82 (InjectionGroup*** array, int* length, int* size,
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15747 "PhotoPage.c"
+#line 15749 "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 15753 "PhotoPage.c"
+#line 15755 "PhotoPage.c"
 }
 
 
@@ -15765,13 +15767,13 @@ static void _vala_array_add83 (InjectionGroup*** array, int* length, int* size,
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15764 "PhotoPage.c"
+#line 15766 "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 15770 "PhotoPage.c"
+#line 15772 "PhotoPage.c"
 }
 
 
@@ -15782,13 +15784,13 @@ static void _vala_array_add84 (InjectionGroup*** array, int* length, int* size,
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15781 "PhotoPage.c"
+#line 15783 "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 15787 "PhotoPage.c"
+#line 15789 "PhotoPage.c"
 }
 
 
@@ -15886,7 +15888,7 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P
 	if (result_length1) {
 #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*result_length1 = _tmp14__length1;
-#line 15885 "PhotoPage.c"
+#line 15887 "PhotoPage.c"
 	}
 #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp14_;
@@ -15898,7 +15900,7 @@ 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 15897 "PhotoPage.c"
+#line 15899 "PhotoPage.c"
 }
 
 
@@ -15936,7 +15938,7 @@ 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 15935 "PhotoPage.c"
+#line 15937 "PhotoPage.c"
 }
 
 
@@ -15955,7 +15957,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 15954 "PhotoPage.c"
+#line 15956 "PhotoPage.c"
 	}
 #line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	action = _tmp1_;
@@ -15963,7 +15965,7 @@ 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 15962 "PhotoPage.c"
+#line 15964 "PhotoPage.c"
 		GSimpleAction* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
 #line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15972,11 +15974,11 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo
 		_tmp4_ = display;
 #line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_simple_action_set_enabled (_tmp3_, _tmp4_);
-#line 15971 "PhotoPage.c"
+#line 15973 "PhotoPage.c"
 	}
 #line 2491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (action);
-#line 15975 "PhotoPage.c"
+#line 15977 "PhotoPage.c"
 }
 
 
@@ -16032,7 +16034,7 @@ 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 16031 "PhotoPage.c"
+#line 16033 "PhotoPage.c"
 		Photo* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		gboolean _tmp8_ = FALSE;
@@ -16046,11 +16048,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 16045 "PhotoPage.c"
+#line 16047 "PhotoPage.c"
 	} else {
 #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 16049 "PhotoPage.c"
+#line 16051 "PhotoPage.c"
 	}
 #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	rotate_possible = _tmp4_;
@@ -16058,7 +16060,7 @@ 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 16057 "PhotoPage.c"
+#line 16059 "PhotoPage.c"
 		Photo* _tmp11_ = NULL;
 		Photo* _tmp12_ = NULL;
 		PhotoFileFormat _tmp13_ = 0;
@@ -16072,11 +16074,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 16071 "PhotoPage.c"
+#line 16073 "PhotoPage.c"
 	} else {
 #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = FALSE;
-#line 16075 "PhotoPage.c"
+#line 16077 "PhotoPage.c"
 	}
 #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	is_raw = _tmp9_;
@@ -16084,7 +16086,7 @@ 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 16083 "PhotoPage.c"
+#line 16085 "PhotoPage.c"
 		ConfigFacade* _tmp16_ = NULL;
 		ConfigFacade* _tmp17_ = NULL;
 		gchar* _tmp18_ = NULL;
@@ -16103,11 +16105,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 16102 "PhotoPage.c"
+#line 16104 "PhotoPage.c"
 	} else {
 #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = FALSE;
-#line 16106 "PhotoPage.c"
+#line 16108 "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_);
@@ -16115,7 +16117,7 @@ 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 16114 "PhotoPage.c"
+#line 16116 "PhotoPage.c"
 		gboolean _tmp22_ = FALSE;
 		Photo* _tmp23_ = NULL;
 		Photo* _tmp24_ = NULL;
@@ -16135,7 +16137,7 @@ 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 16134 "PhotoPage.c"
+#line 16136 "PhotoPage.c"
 		} else {
 			Photo* _tmp27_ = NULL;
 			Photo* _tmp28_ = NULL;
@@ -16150,15 +16152,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 16149 "PhotoPage.c"
+#line 16151 "PhotoPage.c"
 		}
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp22_;
-#line 16153 "PhotoPage.c"
+#line 16155 "PhotoPage.c"
 	} else {
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = FALSE;
-#line 16157 "PhotoPage.c"
+#line 16159 "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_);
@@ -16166,17 +16168,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 16165 "PhotoPage.c"
+#line 16167 "PhotoPage.c"
 		gboolean _tmp32_ = FALSE;
 #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 16171 "PhotoPage.c"
+#line 16173 "PhotoPage.c"
 	} else {
 #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = FALSE;
-#line 16175 "PhotoPage.c"
+#line 16177 "PhotoPage.c"
 	}
 #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_) {
@@ -16184,7 +16186,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 16183 "PhotoPage.c"
+#line 16185 "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));
@@ -16194,7 +16196,7 @@ 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 16193 "PhotoPage.c"
+#line 16195 "PhotoPage.c"
 		Photo* _tmp36_ = NULL;
 		Photo* _tmp37_ = NULL;
 		gboolean _tmp38_ = FALSE;
@@ -16208,11 +16210,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 16207 "PhotoPage.c"
+#line 16209 "PhotoPage.c"
 	} else {
 #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = FALSE;
-#line 16211 "PhotoPage.c"
+#line 16213 "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_);
@@ -16248,7 +16250,7 @@ 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 16247 "PhotoPage.c"
+#line 16249 "PhotoPage.c"
 		Photo* _tmp47_ = NULL;
 		Photo* _tmp48_ = NULL;
 		Scaling _tmp49_ = {0};
@@ -16281,7 +16283,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 16280 "PhotoPage.c"
+#line 16282 "PhotoPage.c"
 	}
 #line 2531 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_flag_action (self);
@@ -16289,7 +16291,7 @@ 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 16288 "PhotoPage.c"
+#line 16290 "PhotoPage.c"
 		ConfigFacade* _tmp57_ = NULL;
 		ConfigFacade* _tmp58_ = NULL;
 		gchar* _tmp59_ = NULL;
@@ -16308,11 +16310,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 16307 "PhotoPage.c"
+#line 16309 "PhotoPage.c"
 	} else {
 #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp55_ = FALSE;
-#line 16311 "PhotoPage.c"
+#line 16313 "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_);
@@ -16322,7 +16324,7 @@ 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 16321 "PhotoPage.c"
+#line 16323 "PhotoPage.c"
 }
 
 
@@ -16335,7 +16337,7 @@ static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) {
 	_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 16334 "PhotoPage.c"
+#line 16336 "PhotoPage.c"
 		gboolean _tmp2_ = FALSE;
 		Photo* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
@@ -16355,7 +16357,7 @@ static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) {
 		if (_tmp6_) {
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = TRUE;
-#line 16354 "PhotoPage.c"
+#line 16356 "PhotoPage.c"
 		} else {
 			Photo* _tmp7_ = NULL;
 			Photo* _tmp8_ = NULL;
@@ -16370,21 +16372,21 @@ 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 16369 "PhotoPage.c"
+#line 16371 "PhotoPage.c"
 		}
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 16373 "PhotoPage.c"
+#line 16375 "PhotoPage.c"
 	} else {
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 16377 "PhotoPage.c"
+#line 16379 "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 16383 "PhotoPage.c"
+#line 16385 "PhotoPage.c"
 }
 
 
@@ -16398,7 +16400,7 @@ static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self,
 	static GQuark _tmp3_label0 = 0;
 #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp3_label1 = 0;
-#line 16397 "PhotoPage.c"
+#line 16399 "PhotoPage.c"
 	RawDeveloper _tmp5_ = 0;
 	GSimpleAction* _tmp6_ = NULL;
 	GVariant* _tmp7_ = NULL;
@@ -16420,38 +16422,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 16419 "PhotoPage.c"
+#line 16421 "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 16426 "PhotoPage.c"
+#line 16428 "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 16432 "PhotoPage.c"
+#line 16434 "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 16439 "PhotoPage.c"
+#line 16441 "PhotoPage.c"
 			}
 		}
 	} else {
 #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16445 "PhotoPage.c"
+#line 16447 "PhotoPage.c"
 			default:
 			{
 #line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16450 "PhotoPage.c"
+#line 16452 "PhotoPage.c"
 			}
 		}
 	}
@@ -16465,7 +16467,7 @@ 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 16464 "PhotoPage.c"
+#line 16466 "PhotoPage.c"
 }
 
 
@@ -16503,7 +16505,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 16502 "PhotoPage.c"
+#line 16504 "PhotoPage.c"
 	}
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -16525,7 +16527,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 16524 "PhotoPage.c"
+#line 16526 "PhotoPage.c"
 	}
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
@@ -16543,7 +16545,7 @@ 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 16542 "PhotoPage.c"
+#line 16544 "PhotoPage.c"
 	} else {
 		RawDeveloper _tmp15_ = 0;
 		Photo* _tmp16_ = NULL;
@@ -16559,7 +16561,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 16558 "PhotoPage.c"
+#line 16560 "PhotoPage.c"
 	}
 #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_) {
@@ -16567,7 +16569,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 16566 "PhotoPage.c"
+#line 16568 "PhotoPage.c"
 	}
 #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = photo;
@@ -16577,18 +16579,18 @@ 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 16576 "PhotoPage.c"
+#line 16578 "PhotoPage.c"
 	} else {
 		gboolean _tmp22_ = FALSE;
 #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 16583 "PhotoPage.c"
+#line 16585 "PhotoPage.c"
 	}
 #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp19_) {
-#line 16587 "PhotoPage.c"
+#line 16589 "PhotoPage.c"
 		SetRawDeveloperCommand* command = NULL;
 		ViewCollection* _tmp23_ = NULL;
 		ViewCollection* _tmp24_ = NULL;
@@ -16634,11 +16636,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 16633 "PhotoPage.c"
+#line 16635 "PhotoPage.c"
 	}
 #line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 16637 "PhotoPage.c"
+#line 16639 "PhotoPage.c"
 }
 
 
@@ -16647,7 +16649,7 @@ 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 16646 "PhotoPage.c"
+#line 16648 "PhotoPage.c"
 }
 
 
@@ -16659,14 +16661,14 @@ static void library_photo_page_update_flag_action (LibraryPhotoPage* self) {
 	_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 16658 "PhotoPage.c"
+#line 16660 "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 16665 "PhotoPage.c"
+#line 16667 "PhotoPage.c"
 }
 
 
@@ -16701,7 +16703,7 @@ 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 16700 "PhotoPage.c"
+#line 16702 "PhotoPage.c"
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16712,7 +16714,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_ = _tmp6_;
-#line 16711 "PhotoPage.c"
+#line 16713 "PhotoPage.c"
 	} else {
 		CollectionPage* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
@@ -16724,7 +16726,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 16723 "PhotoPage.c"
+#line 16725 "PhotoPage.c"
 	}
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = photo;
@@ -16732,7 +16734,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 16731 "PhotoPage.c"
+#line 16733 "PhotoPage.c"
 }
 
 
@@ -16745,7 +16747,7 @@ 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 16744 "PhotoPage.c"
+#line 16746 "PhotoPage.c"
 }
 
 
@@ -16763,7 +16765,7 @@ CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self)
 	result = _tmp1_;
 #line 2608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16762 "PhotoPage.c"
+#line 16764 "PhotoPage.c"
 }
 
 
@@ -16800,7 +16802,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 16799 "PhotoPage.c"
+#line 16801 "PhotoPage.c"
 }
 
 
@@ -16810,7 +16812,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 16809 "PhotoPage.c"
+#line 16811 "PhotoPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -16822,11 +16824,11 @@ 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 16821 "PhotoPage.c"
+#line 16823 "PhotoPage.c"
 			GActionEntry entry = {0};
 #line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			entry = entry_collection[entry_it];
-#line 16825 "PhotoPage.c"
+#line 16827 "PhotoPage.c"
 			{
 				AppWindow* _tmp0_ = NULL;
 				AppWindow* _tmp1_ = NULL;
@@ -16844,7 +16846,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 16843 "PhotoPage.c"
+#line 16845 "PhotoPage.c"
 			}
 		}
 	}
@@ -16870,7 +16872,7 @@ 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 16869 "PhotoPage.c"
+#line 16871 "PhotoPage.c"
 	} else {
 		ConfigFacade* _tmp2_ = NULL;
 		ConfigFacade* _tmp3_ = NULL;
@@ -16885,7 +16887,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 16884 "PhotoPage.c"
+#line 16886 "PhotoPage.c"
 	}
 #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -16893,7 +16895,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 16892 "PhotoPage.c"
+#line 16894 "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));
@@ -16913,7 +16915,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 16912 "PhotoPage.c"
+#line 16914 "PhotoPage.c"
 }
 
 
@@ -16931,7 +16933,7 @@ 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 16930 "PhotoPage.c"
+#line 16932 "PhotoPage.c"
 	} else {
 		Photo* _tmp2_ = NULL;
 		LibraryPhoto* _tmp3_ = NULL;
@@ -16946,7 +16948,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 16945 "PhotoPage.c"
+#line 16947 "PhotoPage.c"
 	}
 #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -16954,7 +16956,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 16953 "PhotoPage.c"
+#line 16955 "PhotoPage.c"
 	}
 #line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE);
@@ -16962,7 +16964,7 @@ 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 16961 "PhotoPage.c"
+#line 16963 "PhotoPage.c"
 }
 
 
@@ -16992,7 +16994,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 16991 "PhotoPage.c"
+#line 16993 "PhotoPage.c"
 	}
 #line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = app_window_get_instance ();
@@ -17022,7 +17024,7 @@ 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 17021 "PhotoPage.c"
+#line 17023 "PhotoPage.c"
 }
 
 
@@ -17041,17 +17043,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 17040 "PhotoPage.c"
+#line 17042 "PhotoPage.c"
 		gboolean _tmp3_ = FALSE;
 #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 17046 "PhotoPage.c"
+#line 17048 "PhotoPage.c"
 	} else {
 #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 17050 "PhotoPage.c"
+#line 17052 "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_);
@@ -17061,21 +17063,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 17060 "PhotoPage.c"
+#line 17062 "PhotoPage.c"
 		gboolean _tmp7_ = FALSE;
 #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 17066 "PhotoPage.c"
+#line 17068 "PhotoPage.c"
 	} else {
 #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 17070 "PhotoPage.c"
+#line 17072 "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 17074 "PhotoPage.c"
+#line 17076 "PhotoPage.c"
 }
 
 
@@ -17087,7 +17089,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 17086 "PhotoPage.c"
+#line 17088 "PhotoPage.c"
 }
 
 
@@ -17099,7 +17101,7 @@ 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 17098 "PhotoPage.c"
+#line 17100 "PhotoPage.c"
 }
 
 
@@ -17125,7 +17127,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 17124 "PhotoPage.c"
+#line 17126 "PhotoPage.c"
 	}
 #line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = event;
@@ -17141,13 +17143,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 17140 "PhotoPage.c"
+#line 17142 "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 17146 "PhotoPage.c"
+#line 17148 "PhotoPage.c"
 	}
 }
 
@@ -17227,7 +17229,7 @@ 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 17226 "PhotoPage.c"
+#line 17228 "PhotoPage.c"
 }
 
 
@@ -17244,20 +17246,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 17243 "PhotoPage.c"
+#line 17245 "PhotoPage.c"
 		Photo* _tmp1_ = NULL;
 #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 17249 "PhotoPage.c"
+#line 17251 "PhotoPage.c"
 	} else {
 		Photo* _tmp2_ = NULL;
 #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 17256 "PhotoPage.c"
+#line 17258 "PhotoPage.c"
 	}
 #line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = photo;
@@ -17265,7 +17267,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 17264 "PhotoPage.c"
+#line 17266 "PhotoPage.c"
 }
 
 
@@ -17321,7 +17323,7 @@ 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 17320 "PhotoPage.c"
+#line 17322 "PhotoPage.c"
 		GdkEventKey* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
 #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17330,11 +17332,11 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
 		_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 17329 "PhotoPage.c"
+#line 17331 "PhotoPage.c"
 	} else {
 #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 17333 "PhotoPage.c"
+#line 17335 "PhotoPage.c"
 	}
 #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -17342,7 +17344,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 17341 "PhotoPage.c"
+#line 17343 "PhotoPage.c"
 	}
 #line 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	handled = TRUE;
@@ -17360,7 +17362,7 @@ 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 17359 "PhotoPage.c"
+#line 17361 "PhotoPage.c"
 			default:
 			{
 				GtkWindow* _tmp9_ = NULL;
@@ -17378,193 +17380,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 17377 "PhotoPage.c"
+#line 17379 "PhotoPage.c"
 				}
 #line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17381 "PhotoPage.c"
+#line 17383 "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 17387 "PhotoPage.c"
+#line 17389 "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 17394 "PhotoPage.c"
+#line 17396 "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 17400 "PhotoPage.c"
+#line 17402 "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 17407 "PhotoPage.c"
+#line 17409 "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 17413 "PhotoPage.c"
+#line 17415 "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 17420 "PhotoPage.c"
+#line 17422 "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 17426 "PhotoPage.c"
+#line 17428 "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 17433 "PhotoPage.c"
+#line 17435 "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 17439 "PhotoPage.c"
+#line 17441 "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 17446 "PhotoPage.c"
+#line 17448 "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 17452 "PhotoPage.c"
+#line 17454 "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 17459 "PhotoPage.c"
+#line 17461 "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 17465 "PhotoPage.c"
+#line 17467 "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 17472 "PhotoPage.c"
+#line 17474 "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 17478 "PhotoPage.c"
+#line 17480 "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 17485 "PhotoPage.c"
+#line 17487 "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 17491 "PhotoPage.c"
+#line 17493 "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 17498 "PhotoPage.c"
+#line 17500 "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 17504 "PhotoPage.c"
+#line 17506 "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 17511 "PhotoPage.c"
+#line 17513 "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 17517 "PhotoPage.c"
+#line 17519 "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 17524 "PhotoPage.c"
+#line 17526 "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 17530 "PhotoPage.c"
+#line 17532 "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 17537 "PhotoPage.c"
+#line 17539 "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 17543 "PhotoPage.c"
+#line 17545 "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 17550 "PhotoPage.c"
+#line 17552 "PhotoPage.c"
 			}
 		}
 	} else {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17556 "PhotoPage.c"
+#line 17558 "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 17563 "PhotoPage.c"
+#line 17565 "PhotoPage.c"
 			}
 		}
 	}
@@ -17572,7 +17574,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 17571 "PhotoPage.c"
+#line 17573 "PhotoPage.c"
 }
 
 
@@ -17595,7 +17597,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 17594 "PhotoPage.c"
+#line 17596 "PhotoPage.c"
 	}
 #line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	fs = _tmp1_;
@@ -17605,14 +17607,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 17604 "PhotoPage.c"
+#line 17606 "PhotoPage.c"
 	} else {
 		FullscreenWindow* _tmp3_ = NULL;
 #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 17611 "PhotoPage.c"
+#line 17613 "PhotoPage.c"
 	}
 #line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
@@ -17620,7 +17622,7 @@ 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 17619 "PhotoPage.c"
+#line 17621 "PhotoPage.c"
 }
 
 
@@ -17646,7 +17648,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 17645 "PhotoPage.c"
+#line 17647 "PhotoPage.c"
 	}
 #line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
@@ -17656,7 +17658,7 @@ 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 17655 "PhotoPage.c"
+#line 17657 "PhotoPage.c"
 }
 
 
@@ -17671,7 +17673,7 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
 	_tmp0_ = self->priv->context_menu;
 #line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 17670 "PhotoPage.c"
+#line 17672 "PhotoPage.c"
 		GMenuModel* model = NULL;
 		GtkBuilder* _tmp1_ = NULL;
 		GObject* _tmp2_ = NULL;
@@ -17703,7 +17705,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 17702 "PhotoPage.c"
+#line 17704 "PhotoPage.c"
 	}
 #line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = self->priv->context_menu;
@@ -17713,7 +17715,7 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
 	result = _tmp8_;
 #line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17712 "PhotoPage.c"
+#line 17714 "PhotoPage.c"
 }
 
 
@@ -17741,7 +17743,7 @@ 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 17740 "PhotoPage.c"
+#line 17742 "PhotoPage.c"
 }
 
 
@@ -17764,7 +17766,7 @@ 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 17763 "PhotoPage.c"
+#line 17765 "PhotoPage.c"
 }
 
 
@@ -17776,7 +17778,7 @@ static void library_photo_page_return_to_collection (LibraryPhotoPage* self) {
 	_tmp0_ = self->priv->return_page;
 #line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (NULL != _tmp0_) {
-#line 17775 "PhotoPage.c"
+#line 17777 "PhotoPage.c"
 		LibraryWindow* _tmp1_ = NULL;
 		LibraryWindow* _tmp2_ = NULL;
 		CollectionPage* _tmp3_ = NULL;
@@ -17790,7 +17792,7 @@ 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 17789 "PhotoPage.c"
+#line 17791 "PhotoPage.c"
 	} else {
 		LibraryWindow* _tmp4_ = NULL;
 		LibraryWindow* _tmp5_ = NULL;
@@ -17802,7 +17804,7 @@ 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 17801 "PhotoPage.c"
+#line 17803 "PhotoPage.c"
 	}
 }
 
@@ -17821,7 +17823,7 @@ static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self) {
 #line 2869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 2871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp1_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 2871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 2872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17836,7 +17838,7 @@ static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self) {
 	_g_object_unref0 (photos);
 #line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 17835 "PhotoPage.c"
+#line 17837 "PhotoPage.c"
 }
 
 
@@ -17869,13 +17871,13 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 	if (!_tmp0_) {
 #line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 17868 "PhotoPage.c"
+#line 17870 "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 17874 "PhotoPage.c"
+#line 17876 "PhotoPage.c"
 		LibraryWindow* _tmp2_ = NULL;
 		LibraryWindow* _tmp3_ = NULL;
 #line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17886,14 +17888,14 @@ 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 17885 "PhotoPage.c"
+#line 17887 "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));
 #line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 2892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 2892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17918,7 +17920,7 @@ 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 17917 "PhotoPage.c"
+#line 17919 "PhotoPage.c"
 		LibraryWindow* _tmp13_ = NULL;
 		LibraryWindow* _tmp14_ = NULL;
 		GtkWindow* _tmp15_ = NULL;
@@ -17944,7 +17946,7 @@ 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 17943 "PhotoPage.c"
+#line 17945 "PhotoPage.c"
 			GtkWindow* _tmp18_ = NULL;
 			FullscreenWindow* _tmp19_ = NULL;
 #line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17955,7 +17957,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 17954 "PhotoPage.c"
+#line 17956 "PhotoPage.c"
 		}
 #line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = library_window_get_app ();
@@ -17965,7 +17967,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 17964 "PhotoPage.c"
+#line 17966 "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));
@@ -17995,7 +17997,7 @@ 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 17994 "PhotoPage.c"
+#line 17996 "PhotoPage.c"
 }
 
 
@@ -18007,7 +18009,7 @@ static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) {
 	_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 18006 "PhotoPage.c"
+#line 18008 "PhotoPage.c"
 		GeeArrayList* photo_list = NULL;
 		GeeArrayList* _tmp1_ = NULL;
 		GeeArrayList* _tmp2_ = NULL;
@@ -18022,7 +18024,7 @@ static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) {
 		FlagUnflagCommand* _tmp11_ = NULL;
 		FlagUnflagCommand* _tmp12_ = NULL;
 #line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+		_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"
 		photo_list = _tmp1_;
 #line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18061,7 +18063,7 @@ 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 18060 "PhotoPage.c"
+#line 18062 "PhotoPage.c"
 	}
 }
 
@@ -18076,7 +18078,7 @@ 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 18075 "PhotoPage.c"
+#line 18077 "PhotoPage.c"
 }
 
 
@@ -18108,7 +18110,7 @@ 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 18107 "PhotoPage.c"
+#line 18109 "PhotoPage.c"
 	} else {
 		LibraryPhoto* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
@@ -18126,13 +18128,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 18125 "PhotoPage.c"
+#line 18127 "PhotoPage.c"
 	}
 #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18131 "PhotoPage.c"
+#line 18133 "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));
@@ -18176,7 +18178,7 @@ 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 18175 "PhotoPage.c"
+#line 18177 "PhotoPage.c"
 		LibraryWindow* _tmp20_ = NULL;
 		LibraryWindow* _tmp21_ = NULL;
 #line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18187,11 +18189,11 @@ 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 18186 "PhotoPage.c"
+#line 18188 "PhotoPage.c"
 	}
 #line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (view);
-#line 18190 "PhotoPage.c"
+#line 18192 "PhotoPage.c"
 }
 
 
@@ -18214,7 +18216,7 @@ 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 18213 "PhotoPage.c"
+#line 18215 "PhotoPage.c"
 		PrintManager* _tmp4_ = NULL;
 		PrintManager* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
@@ -18241,7 +18243,7 @@ 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 18240 "PhotoPage.c"
+#line 18242 "PhotoPage.c"
 	}
 }
 
@@ -18255,7 +18257,7 @@ static void library_photo_page_on_external_app_changed (LibraryPhotoPage* self)
 	_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 18254 "PhotoPage.c"
+#line 18256 "PhotoPage.c"
 		ConfigFacade* _tmp2_ = NULL;
 		ConfigFacade* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
@@ -18274,15 +18276,15 @@ 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 18273 "PhotoPage.c"
+#line 18275 "PhotoPage.c"
 	} else {
 #line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 18277 "PhotoPage.c"
+#line 18279 "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 18281 "PhotoPage.c"
+#line 18283 "PhotoPage.c"
 }
 
 
@@ -18297,7 +18299,7 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 	if (!_tmp0_) {
 #line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18296 "PhotoPage.c"
+#line 18298 "PhotoPage.c"
 	}
 	{
 		AppWindow* _tmp1_ = NULL;
@@ -18324,7 +18326,7 @@ 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 18323 "PhotoPage.c"
+#line 18325 "PhotoPage.c"
 			goto __catch251_g_error;
 		}
 #line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18335,7 +18337,7 @@ 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 18334 "PhotoPage.c"
+#line 18336 "PhotoPage.c"
 	}
 	goto __finally251;
 	__catch251_g_error:
@@ -18370,7 +18372,7 @@ 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 18369 "PhotoPage.c"
+#line 18371 "PhotoPage.c"
 	}
 	__finally251:
 #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18381,7 +18383,7 @@ 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 18380 "PhotoPage.c"
+#line 18382 "PhotoPage.c"
 	}
 }
 
@@ -18401,7 +18403,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 18400 "PhotoPage.c"
+#line 18402 "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));
@@ -18417,7 +18419,7 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 	if (_tmp4_) {
 #line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18416 "PhotoPage.c"
+#line 18418 "PhotoPage.c"
 	}
 	{
 		AppWindow* _tmp5_ = NULL;
@@ -18444,7 +18446,7 @@ 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 18443 "PhotoPage.c"
+#line 18445 "PhotoPage.c"
 			goto __catch252_g_error;
 		}
 #line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18455,7 +18457,7 @@ 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 18454 "PhotoPage.c"
+#line 18456 "PhotoPage.c"
 	}
 	goto __finally252;
 	__catch252_g_error:
@@ -18490,7 +18492,7 @@ 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 18489 "PhotoPage.c"
+#line 18491 "PhotoPage.c"
 	}
 	__finally252:
 #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18501,7 +18503,7 @@ 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 18500 "PhotoPage.c"
+#line 18502 "PhotoPage.c"
 	}
 }
 
@@ -18514,7 +18516,7 @@ static void library_photo_page_on_send_to (LibraryPhotoPage* self) {
 	_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 18513 "PhotoPage.c"
+#line 18515 "PhotoPage.c"
 		ViewCollection* _tmp1_ = NULL;
 		ViewCollection* _tmp2_ = NULL;
 		GeeList* _tmp3_ = NULL;
@@ -18533,7 +18535,7 @@ 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 18532 "PhotoPage.c"
+#line 18534 "PhotoPage.c"
 	}
 }
 
@@ -18573,7 +18575,7 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 	if (!_tmp0_) {
 #line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18572 "PhotoPage.c"
+#line 18574 "PhotoPage.c"
 	}
 #line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _ ("Export Photo");
@@ -18601,7 +18603,7 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		_g_object_unref0 (export_dialog);
 #line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18600 "PhotoPage.c"
+#line 18602 "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));
@@ -18633,7 +18635,7 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		_g_object_unref0 (export_dialog);
 #line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18632 "PhotoPage.c"
+#line 18634 "PhotoPage.c"
 	}
 #line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = constraint;
@@ -18643,7 +18645,7 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 	scaling_for_constraint (_tmp16_, _tmp17_, FALSE, &_tmp18_);
 #line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scaling = _tmp18_;
-#line 18642 "PhotoPage.c"
+#line 18644 "PhotoPage.c"
 	{
 		Photo* _tmp19_ = NULL;
 		Photo* _tmp20_ = NULL;
@@ -18695,7 +18697,7 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		_g_object_unref0 (_tmp20_);
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18694 "PhotoPage.c"
+#line 18696 "PhotoPage.c"
 			goto __catch253_g_error;
 		}
 	}
@@ -18739,7 +18741,7 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		_g_free0 (_tmp36_);
 #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18738 "PhotoPage.c"
+#line 18740 "PhotoPage.c"
 	}
 	__finally253:
 #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18754,13 +18756,13 @@ 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 18753 "PhotoPage.c"
+#line 18755 "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 18759 "PhotoPage.c"
+#line 18761 "PhotoPage.c"
 }
 
 
@@ -18783,7 +18785,7 @@ 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 18782 "PhotoPage.c"
+#line 18784 "PhotoPage.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		GeeList* _tmp6_ = NULL;
@@ -18802,7 +18804,7 @@ 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 18801 "PhotoPage.c"
+#line 18803 "PhotoPage.c"
 	}
 }
 
@@ -18826,20 +18828,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 18825 "PhotoPage.c"
+#line 18827 "PhotoPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
 #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 18832 "PhotoPage.c"
+#line 18834 "PhotoPage.c"
 	}
 #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 3030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18838 "PhotoPage.c"
+#line 18840 "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));
@@ -18867,7 +18869,7 @@ 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 18866 "PhotoPage.c"
+#line 18868 "PhotoPage.c"
 }
 
 
@@ -18890,20 +18892,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 18889 "PhotoPage.c"
+#line 18891 "PhotoPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
 #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 18896 "PhotoPage.c"
+#line 18898 "PhotoPage.c"
 	}
 #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 3040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18902 "PhotoPage.c"
+#line 18904 "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));
@@ -18931,7 +18933,7 @@ 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 18930 "PhotoPage.c"
+#line 18932 "PhotoPage.c"
 }
 
 
@@ -18955,20 +18957,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 18954 "PhotoPage.c"
+#line 18956 "PhotoPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
 #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 18961 "PhotoPage.c"
+#line 18963 "PhotoPage.c"
 	}
 #line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 3050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18967 "PhotoPage.c"
+#line 18969 "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));
@@ -18998,7 +19000,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 18997 "PhotoPage.c"
+#line 18999 "PhotoPage.c"
 }
 
 
@@ -19007,7 +19009,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 19006 "PhotoPage.c"
+#line 19008 "PhotoPage.c"
 }
 
 
@@ -19016,7 +19018,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 19015 "PhotoPage.c"
+#line 19017 "PhotoPage.c"
 }
 
 
@@ -19025,7 +19027,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 19024 "PhotoPage.c"
+#line 19026 "PhotoPage.c"
 }
 
 
@@ -19034,7 +19036,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 19033 "PhotoPage.c"
+#line 19035 "PhotoPage.c"
 }
 
 
@@ -19043,7 +19045,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 19042 "PhotoPage.c"
+#line 19044 "PhotoPage.c"
 }
 
 
@@ -19052,7 +19054,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 19051 "PhotoPage.c"
+#line 19053 "PhotoPage.c"
 }
 
 
@@ -19061,7 +19063,7 @@ 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 19060 "PhotoPage.c"
+#line 19062 "PhotoPage.c"
 }
 
 
@@ -19191,21 +19193,21 @@ 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 19190 "PhotoPage.c"
+#line 19192 "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 19197 "PhotoPage.c"
+#line 19199 "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 19204 "PhotoPage.c"
+#line 19206 "PhotoPage.c"
 }
 
 
@@ -19239,7 +19241,7 @@ 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 19238 "PhotoPage.c"
+#line 19240 "PhotoPage.c"
 		Photo* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		RawDeveloper _tmp8_ = 0;
@@ -19258,7 +19260,7 @@ 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 19257 "PhotoPage.c"
+#line 19259 "PhotoPage.c"
 			{
 				GAction* _tmp10_ = NULL;
 				GAction* _tmp11_ = NULL;
@@ -19277,13 +19279,13 @@ 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 19276 "PhotoPage.c"
+#line 19278 "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 19282 "PhotoPage.c"
+#line 19284 "PhotoPage.c"
 			{
 				GAction* _tmp13_ = NULL;
 				GAction* _tmp14_ = NULL;
@@ -19302,13 +19304,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 19301 "PhotoPage.c"
+#line 19303 "PhotoPage.c"
 			}
 			default:
 			{
 #line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_assert_not_reached ();
-#line 19307 "PhotoPage.c"
+#line 19309 "PhotoPage.c"
 			}
 		}
 	}
@@ -19340,7 +19342,7 @@ 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 19339 "PhotoPage.c"
+#line 19341 "PhotoPage.c"
 		GeeMap* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
@@ -19365,17 +19367,17 @@ 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 19364 "PhotoPage.c"
+#line 19366 "PhotoPage.c"
 	} else {
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 19368 "PhotoPage.c"
+#line 19370 "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 19374 "PhotoPage.c"
+#line 19376 "PhotoPage.c"
 	}
 }
 
@@ -19413,7 +19415,7 @@ 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 19412 "PhotoPage.c"
+#line 19414 "PhotoPage.c"
 		CommandManager* _tmp5_ = NULL;
 		CommandManager* _tmp6_ = NULL;
 		HierarchicalTagIndex* _tmp7_ = NULL;
@@ -19474,13 +19476,13 @@ 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 19473 "PhotoPage.c"
+#line 19475 "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 19479 "PhotoPage.c"
+#line 19481 "PhotoPage.c"
 }
 
 
@@ -19549,7 +19551,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 19548 "PhotoPage.c"
+#line 19550 "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));
@@ -19575,7 +19577,7 @@ 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 19574 "PhotoPage.c"
+#line 19576 "PhotoPage.c"
 }
 
 
@@ -19607,7 +19609,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 19606 "PhotoPage.c"
+#line 19608 "PhotoPage.c"
 }
 
 
@@ -19617,14 +19619,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 19616 "PhotoPage.c"
+#line 19618 "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 19623 "PhotoPage.c"
+#line 19625 "PhotoPage.c"
 }
 
 
@@ -19632,8 +19634,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 = library_photo_page_library_photo_page_view_filter_real_predicate;
-#line 19632 "PhotoPage.c"
+	((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) library_photo_page_library_photo_page_view_filter_real_predicate;
+#line 19634 "PhotoPage.c"
 }
 
 
@@ -19659,48 +19661,48 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 19699 "PhotoPage.c"
+#line 19701 "PhotoPage.c"
 }
 
 
@@ -19716,7 +19718,7 @@ 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 19715 "PhotoPage.c"
+#line 19717 "PhotoPage.c"
 }
 
 
@@ -19761,7 +19763,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 19760 "PhotoPage.c"
+#line 19762 "PhotoPage.c"
 }
 
 
diff --git a/src/PixbufCache.c b/src/PixbufCache.c
index 229c57a..56575f3 100644
--- a/src/PixbufCache.c
+++ b/src/PixbufCache.c
@@ -1,4 +1,4 @@
-/* PixbufCache.c generated by valac 0.34.4, the Vala compiler
+/* PixbufCache.c generated by valac 0.34.7, the Vala compiler
  * generated from PixbufCache.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1331,7 +1331,7 @@ void pixbuf_cache_cancel_all (PixbufCache* self) {
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp0_ = self->priv->in_progress;
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+		_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp2_ = _tmp1_;
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1914,7 +1914,7 @@ static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pi
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp6_ = self->priv->lru;
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp8_ = _tmp7_;
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1930,7 +1930,7 @@ static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pi
 #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp11_ = self->priv->lru;
 #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp13_ = _tmp12_;
 #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1960,13 +1960,13 @@ static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pi
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp20_ = self->priv->lru;
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp22_ = _tmp21_;
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp23_ = self->priv->cache;
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp24_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_MAP, GeeMap));
+	_tmp24_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp25_ = _tmp24_;
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2062,7 +2062,7 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER (GClosure * clos
 PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_construct (GType object_type) {
 	PixbufCachePixbufCacheBatch * self = NULL;
 #line 17 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	self = (PixbufCachePixbufCacheBatch*) gee_tree_multi_map_construct (object_type, BACKGROUND_JOB_TYPE_JOB_PRIORITY, NULL, NULL, TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, (GCompareDataFunc) background_job_job_priority_compare_func, NULL, NULL, NULL, NULL, NULL);
+	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"
@@ -2182,7 +2182,7 @@ 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 = pixbuf_cache_fetch_job_real_get_priority;
+	((BackgroundJobClass *) klass)->get_priority = (BackgroundJobJobPriority (*)(BackgroundJob*)) pixbuf_cache_fetch_job_real_get_priority;
 #line 2187 "PixbufCache.c"
 }
 
@@ -2342,7 +2342,7 @@ 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 = pixbuf_cache_baseline_fetch_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) pixbuf_cache_baseline_fetch_job_real_execute;
 #line 2347 "PixbufCache.c"
 }
 
@@ -2481,7 +2481,7 @@ 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 = pixbuf_cache_master_fetch_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) pixbuf_cache_master_fetch_job_real_execute;
 #line 2486 "PixbufCache.c"
 }
 
@@ -2522,15 +2522,15 @@ static void pixbuf_cache_instance_init (PixbufCache * self) {
 #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"
-	_tmp0_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 79 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self->priv->cache = _tmp0_;
 #line 80 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp1_ = gee_array_list_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp1_ = gee_array_list_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 80 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self->priv->lru = _tmp1_;
 #line 81 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	_tmp2_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, PIXBUF_CACHE_TYPE_FETCH_JOB, (GBoxedCopyFunc) background_job_ref, background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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"
@@ -2577,7 +2577,7 @@ static void pixbuf_cache_finalize (GObject* obj) {
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp5_ = self->priv->in_progress;
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-		_tmp6_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_MAP, GeeMap));
+		_tmp6_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp7_ = _tmp6_;
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
diff --git a/src/Printing.c b/src/Printing.c
index 8847e70..a9d2d3e 100644
--- a/src/Printing.c
+++ b/src/Printing.c
@@ -1,4 +1,4 @@
-/* Printing.c generated by valac 0.34.4, the Vala compiler
+/* Printing.c generated by valac 0.34.7, the Vala compiler
  * generated from Printing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -4967,7 +4967,7 @@ static void print_job_instance_init (PrintJob * self) {
 #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, g_object_unref, NULL, NULL, NULL);
+	_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"
diff --git a/src/Properties.c b/src/Properties.c
index eee82c8..58b0cd2 100644
--- a/src/Properties.c
+++ b/src/Properties.c
@@ -1,4 +1,4 @@
-/* Properties.c generated by valac 0.34.4, the Vala compiler
+/* Properties.c generated by valac 0.34.7, the Vala compiler
  * generated from Properties.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1850,15 +1850,15 @@ 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 = 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 = 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 = 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 = 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 = 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"
@@ -3843,15 +3843,15 @@ 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 = 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 = 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 = 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 = 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 = 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"
@@ -5692,11 +5692,11 @@ 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 = 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 = 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 = 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"
@@ -5770,11 +5770,11 @@ 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 = 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 = 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 = 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"
diff --git a/src/Resources.c b/src/Resources.c
index dd4b18c..b2e861e 100644
--- a/src/Resources.c
+++ b/src/Resources.c
@@ -1,4 +1,4 @@
-/* Resources.c generated by valac 0.34.4, the Vala compiler
+/* Resources.c generated by valac 0.34.7, the Vala compiler
  * generated from Resources.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -3159,7 +3159,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 #line 3131 "Resources.c"
 		GeeHashMap* _tmp11_ = NULL;
 #line 904 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+		_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"
@@ -3240,7 +3240,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 #line 3212 "Resources.c"
 		GeeHashMap* _tmp27_ = NULL;
 #line 922 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp27_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+		_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"
@@ -3803,7 +3803,7 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
 #line 3775 "Resources.c"
 		GeeHashMap* _tmp1_ = NULL;
 #line 1020 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp1_ = gee_hash_map_new (gtk_widget_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, GTK_TYPE_CSS_PROVIDER, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+		_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"
diff --git a/src/Screensaver.c b/src/Screensaver.c
index 1c0f1f8..3912c48 100644
--- a/src/Screensaver.c
+++ b/src/Screensaver.c
@@ -1,4 +1,4 @@
-/* Screensaver.c generated by valac 0.34.4, the Vala compiler
+/* Screensaver.c generated by valac 0.34.7, the Vala compiler
  * generated from Screensaver.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/SearchFilter.c b/src/SearchFilter.c
index 11e314e..9e6ede5 100644
--- a/src/SearchFilter.c
+++ b/src/SearchFilter.c
@@ -1,4 +1,4 @@
-/* SearchFilter.c generated by valac 0.34.4, the Vala compiler
+/* SearchFilter.c generated by valac 0.34.7, the Vala compiler
  * generated from SearchFilter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1477,11 +1477,12 @@ GType rating_filter_get_type (void) {
 
 
 static guint search_view_filter_real_get_criteria (SearchViewFilter* self) {
+	guint _tmp0_ = 0U;
 #line 65 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	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 0U;
-#line 1485 "SearchFilter.c"
+	return _tmp0_;
+#line 1486 "SearchFilter.c"
 }
 
 
@@ -1490,7 +1491,7 @@ 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 1494 "SearchFilter.c"
+#line 1495 "SearchFilter.c"
 }
 
 
@@ -1509,7 +1510,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 1513 "SearchFilter.c"
+#line 1514 "SearchFilter.c"
 		{
 #line 71 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_REJECTED;
@@ -1517,11 +1518,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 1521 "SearchFilter.c"
+#line 1522 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 1525 "SearchFilter.c"
+#line 1526 "SearchFilter.c"
 		{
 #line 76 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_REJECTED;
@@ -1529,11 +1530,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 1533 "SearchFilter.c"
+#line 1534 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 1537 "SearchFilter.c"
+#line 1538 "SearchFilter.c"
 		{
 #line 81 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_ONE;
@@ -1541,11 +1542,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 1545 "SearchFilter.c"
+#line 1546 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_ONLY:
-#line 1549 "SearchFilter.c"
+#line 1550 "SearchFilter.c"
 		{
 #line 86 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_ONE;
@@ -1553,11 +1554,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 1557 "SearchFilter.c"
+#line 1558 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 1561 "SearchFilter.c"
+#line 1562 "SearchFilter.c"
 		{
 #line 91 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_TWO;
@@ -1565,11 +1566,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 1569 "SearchFilter.c"
+#line 1570 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_ONLY:
-#line 1573 "SearchFilter.c"
+#line 1574 "SearchFilter.c"
 		{
 #line 96 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_TWO;
@@ -1577,11 +1578,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 1581 "SearchFilter.c"
+#line 1582 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 1585 "SearchFilter.c"
+#line 1586 "SearchFilter.c"
 		{
 #line 101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_THREE;
@@ -1589,11 +1590,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 1593 "SearchFilter.c"
+#line 1594 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_ONLY:
-#line 1597 "SearchFilter.c"
+#line 1598 "SearchFilter.c"
 		{
 #line 106 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_THREE;
@@ -1601,11 +1602,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 1605 "SearchFilter.c"
+#line 1606 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 1609 "SearchFilter.c"
+#line 1610 "SearchFilter.c"
 		{
 #line 111 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FOUR;
@@ -1613,11 +1614,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 1617 "SearchFilter.c"
+#line 1618 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_ONLY:
-#line 1621 "SearchFilter.c"
+#line 1622 "SearchFilter.c"
 		{
 #line 116 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FOUR;
@@ -1625,11 +1626,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 1629 "SearchFilter.c"
+#line 1630 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_OR_HIGHER:
-#line 1633 "SearchFilter.c"
+#line 1634 "SearchFilter.c"
 		{
 #line 121 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FIVE;
@@ -1637,11 +1638,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 1641 "SearchFilter.c"
+#line 1642 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_ONLY:
-#line 1645 "SearchFilter.c"
+#line 1646 "SearchFilter.c"
 		{
 #line 126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FIVE;
@@ -1649,12 +1650,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 1653 "SearchFilter.c"
+#line 1654 "SearchFilter.c"
 		}
 		default:
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 1658 "SearchFilter.c"
+#line 1659 "SearchFilter.c"
 		{
 #line 132 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_UNRATED;
@@ -1662,7 +1663,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 1666 "SearchFilter.c"
+#line 1667 "SearchFilter.c"
 		}
 	}
 }
@@ -1682,7 +1683,7 @@ gboolean search_view_filter_has_search_filter (SearchViewFilter* self) {
 	result = !_tmp1_;
 #line 139 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1686 "SearchFilter.c"
+#line 1687 "SearchFilter.c"
 }
 
 
@@ -1697,7 +1698,7 @@ const gchar* search_view_filter_get_search_filter (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 143 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1701 "SearchFilter.c"
+#line 1702 "SearchFilter.c"
 }
 
 
@@ -1721,13 +1722,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 1725 "SearchFilter.c"
+#line 1726 "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 1731 "SearchFilter.c"
+#line 1732 "SearchFilter.c"
 }
 
 
@@ -1738,17 +1739,17 @@ 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 1742 "SearchFilter.c"
+#line 1743 "SearchFilter.c"
 		gchar* _tmp0_ = NULL;
 #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 1748 "SearchFilter.c"
+#line 1749 "SearchFilter.c"
 	}
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1752 "SearchFilter.c"
+#line 1753 "SearchFilter.c"
 }
 
 
@@ -1771,7 +1772,7 @@ 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 1775 "SearchFilter.c"
+#line 1776 "SearchFilter.c"
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -1782,13 +1783,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 1786 "SearchFilter.c"
+#line 1787 "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 1792 "SearchFilter.c"
+#line 1793 "SearchFilter.c"
 	}
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = g_strdup (_tmp0_);
@@ -1800,7 +1801,7 @@ 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 1804 "SearchFilter.c"
+#line 1805 "SearchFilter.c"
 		const gchar* _tmp8_ = NULL;
 		gchar** _tmp9_ = NULL;
 		gchar** _tmp10_ = NULL;
@@ -1816,7 +1817,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 1820 "SearchFilter.c"
+#line 1821 "SearchFilter.c"
 	} else {
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL);
@@ -1826,7 +1827,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 1830 "SearchFilter.c"
+#line 1831 "SearchFilter.c"
 	}
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = (_tmp6_ != NULL) ? _vala_array_dup32 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_);
@@ -1844,7 +1845,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 1848 "SearchFilter.c"
+#line 1849 "SearchFilter.c"
 }
 
 
@@ -1863,7 +1864,7 @@ 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 1867 "SearchFilter.c"
+#line 1868 "SearchFilter.c"
 }
 
 
@@ -1878,7 +1879,7 @@ gboolean search_view_filter_has_saved_search (SearchViewFilter* self) {
 	result = _tmp0_ != NULL;
 #line 161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1882 "SearchFilter.c"
+#line 1883 "SearchFilter.c"
 }
 
 
@@ -1893,7 +1894,7 @@ gboolean search_view_filter_get_rating_allow_higher (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1897 "SearchFilter.c"
+#line 1898 "SearchFilter.c"
 }
 
 
@@ -1908,7 +1909,7 @@ Rating search_view_filter_get_rating (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1912 "SearchFilter.c"
+#line 1913 "SearchFilter.c"
 }
 
 
@@ -1926,31 +1927,31 @@ gboolean search_view_filter_filter_by_media_type (SearchViewFilter* self) {
 	if (_tmp3_) {
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = TRUE;
-#line 1930 "SearchFilter.c"
+#line 1931 "SearchFilter.c"
 	} else {
 		gboolean _tmp4_ = FALSE;
 #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 1937 "SearchFilter.c"
+#line 1938 "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 1943 "SearchFilter.c"
+#line 1944 "SearchFilter.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 #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 1950 "SearchFilter.c"
+#line 1951 "SearchFilter.c"
 	}
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_) {
-#line 1954 "SearchFilter.c"
+#line 1955 "SearchFilter.c"
 		gboolean _tmp6_ = FALSE;
 		gboolean _tmp7_ = FALSE;
 		gboolean _tmp8_ = FALSE;
@@ -1958,45 +1959,45 @@ gboolean search_view_filter_filter_by_media_type (SearchViewFilter* self) {
 		_tmp8_ = self->priv->_show_media_video;
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp8_) {
-#line 1962 "SearchFilter.c"
+#line 1963 "SearchFilter.c"
 			gboolean _tmp9_ = FALSE;
 #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 1968 "SearchFilter.c"
+#line 1969 "SearchFilter.c"
 		} else {
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp7_ = FALSE;
-#line 1972 "SearchFilter.c"
+#line 1973 "SearchFilter.c"
 		}
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp7_) {
-#line 1976 "SearchFilter.c"
+#line 1977 "SearchFilter.c"
 			gboolean _tmp10_ = FALSE;
 #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 1982 "SearchFilter.c"
+#line 1983 "SearchFilter.c"
 		} else {
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp6_ = FALSE;
-#line 1986 "SearchFilter.c"
+#line 1987 "SearchFilter.c"
 		}
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = !_tmp6_;
-#line 1990 "SearchFilter.c"
+#line 1991 "SearchFilter.c"
 	} else {
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = FALSE;
-#line 1994 "SearchFilter.c"
+#line 1995 "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 2000 "SearchFilter.c"
+#line 2001 "SearchFilter.c"
 }
 
 
@@ -2006,7 +2007,7 @@ 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 2010 "SearchFilter.c"
+#line 2011 "SearchFilter.c"
 }
 
 
@@ -2021,7 +2022,7 @@ gboolean search_view_filter_get_flagged (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2025 "SearchFilter.c"
+#line 2026 "SearchFilter.c"
 }
 
 
@@ -2033,7 +2034,7 @@ void search_view_filter_set_flagged (SearchViewFilter* self, gboolean value) {
 	_tmp0_ = value;
 #line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_flagged = _tmp0_;
-#line 2037 "SearchFilter.c"
+#line 2038 "SearchFilter.c"
 }
 
 
@@ -2048,7 +2049,7 @@ gboolean search_view_filter_get_show_media_video (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 51 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2052 "SearchFilter.c"
+#line 2053 "SearchFilter.c"
 }
 
 
@@ -2060,7 +2061,7 @@ void search_view_filter_set_show_media_video (SearchViewFilter* self, gboolean v
 	_tmp0_ = value;
 #line 51 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_show_media_video = _tmp0_;
-#line 2064 "SearchFilter.c"
+#line 2065 "SearchFilter.c"
 }
 
 
@@ -2075,7 +2076,7 @@ gboolean search_view_filter_get_show_media_photos (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 52 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2079 "SearchFilter.c"
+#line 2080 "SearchFilter.c"
 }
 
 
@@ -2087,7 +2088,7 @@ void search_view_filter_set_show_media_photos (SearchViewFilter* self, gboolean
 	_tmp0_ = value;
 #line 52 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_show_media_photos = _tmp0_;
-#line 2091 "SearchFilter.c"
+#line 2092 "SearchFilter.c"
 }
 
 
@@ -2102,7 +2103,7 @@ gboolean search_view_filter_get_show_media_raw (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 53 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2106 "SearchFilter.c"
+#line 2107 "SearchFilter.c"
 }
 
 
@@ -2114,7 +2115,7 @@ void search_view_filter_set_show_media_raw (SearchViewFilter* self, gboolean val
 	_tmp0_ = value;
 #line 53 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_show_media_raw = _tmp0_;
-#line 2118 "SearchFilter.c"
+#line 2119 "SearchFilter.c"
 }
 
 
@@ -2129,14 +2130,14 @@ SavedSearch* search_view_filter_get_saved_search (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2133 "SearchFilter.c"
+#line 2134 "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 2140 "SearchFilter.c"
+#line 2141 "SearchFilter.c"
 }
 
 
@@ -2153,7 +2154,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 2157 "SearchFilter.c"
+#line 2158 "SearchFilter.c"
 }
 
 
@@ -2165,8 +2166,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 = search_view_filter_real_get_criteria;
-#line 2170 "SearchFilter.c"
+	((SearchViewFilterClass *) klass)->get_criteria = (guint (*)(SearchViewFilter*)) search_view_filter_real_get_criteria;
+#line 2171 "SearchFilter.c"
 }
 
 
@@ -2197,7 +2198,7 @@ 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 2201 "SearchFilter.c"
+#line 2202 "SearchFilter.c"
 }
 
 
@@ -2213,7 +2214,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 2217 "SearchFilter.c"
+#line 2218 "SearchFilter.c"
 }
 
 
@@ -2245,7 +2246,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2249 "SearchFilter.c"
+#line 2250 "SearchFilter.c"
 }
 
 
@@ -2283,14 +2284,14 @@ 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 2287 "SearchFilter.c"
+#line 2288 "SearchFilter.c"
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
 #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 2294 "SearchFilter.c"
+#line 2295 "SearchFilter.c"
 			MediaSource* _tmp6_ = NULL;
 			Rating _tmp7_ = 0;
 			Rating _tmp8_ = 0;
@@ -2302,11 +2303,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 2306 "SearchFilter.c"
+#line 2307 "SearchFilter.c"
 		} else {
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp4_ = FALSE;
-#line 2310 "SearchFilter.c"
+#line 2311 "SearchFilter.c"
 		}
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp4_) {
@@ -2316,7 +2317,7 @@ 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 2320 "SearchFilter.c"
+#line 2321 "SearchFilter.c"
 		} else {
 			gboolean _tmp9_ = FALSE;
 			gboolean _tmp10_ = FALSE;
@@ -2324,7 +2325,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_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 2328 "SearchFilter.c"
+#line 2329 "SearchFilter.c"
 				MediaSource* _tmp11_ = NULL;
 				Rating _tmp12_ = 0;
 				Rating _tmp13_ = 0;
@@ -2336,11 +2337,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 2340 "SearchFilter.c"
+#line 2341 "SearchFilter.c"
 			} else {
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp9_ = FALSE;
-#line 2344 "SearchFilter.c"
+#line 2345 "SearchFilter.c"
 			}
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (_tmp9_) {
@@ -2350,7 +2351,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 2354 "SearchFilter.c"
+#line 2355 "SearchFilter.c"
 			}
 		}
 	}
@@ -2358,7 +2359,7 @@ 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 2362 "SearchFilter.c"
+#line 2363 "SearchFilter.c"
 		gboolean _tmp15_ = FALSE;
 		gboolean _tmp16_ = FALSE;
 		gboolean _tmp17_ = FALSE;
@@ -2369,21 +2370,21 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 		_tmp18_ = _tmp17_;
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp18_) {
-#line 2373 "SearchFilter.c"
+#line 2374 "SearchFilter.c"
 			MediaSource* _tmp19_ = NULL;
 #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 2379 "SearchFilter.c"
+#line 2380 "SearchFilter.c"
 		} else {
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp16_ = FALSE;
-#line 2383 "SearchFilter.c"
+#line 2384 "SearchFilter.c"
 		}
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp16_) {
-#line 2387 "SearchFilter.c"
+#line 2388 "SearchFilter.c"
 			MediaSource* _tmp20_ = NULL;
 			gboolean _tmp21_ = FALSE;
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2392,11 +2393,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_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 2396 "SearchFilter.c"
+#line 2397 "SearchFilter.c"
 		} else {
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp15_ = FALSE;
-#line 2400 "SearchFilter.c"
+#line 2401 "SearchFilter.c"
 		}
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp15_) {
@@ -2406,34 +2407,34 @@ 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 2410 "SearchFilter.c"
+#line 2411 "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 2417 "SearchFilter.c"
+#line 2418 "SearchFilter.c"
 		gboolean _tmp24_ = FALSE;
 #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 2423 "SearchFilter.c"
+#line 2424 "SearchFilter.c"
 	} else {
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp22_ = FALSE;
-#line 2427 "SearchFilter.c"
+#line 2428 "SearchFilter.c"
 	}
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp22_) {
-#line 2431 "SearchFilter.c"
+#line 2432 "SearchFilter.c"
 		MediaSource* _tmp25_ = NULL;
 #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 2437 "SearchFilter.c"
+#line 2438 "SearchFilter.c"
 			gboolean _tmp26_ = FALSE;
 			gboolean _tmp27_ = FALSE;
 #line 202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2448,7 +2449,7 @@ 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 2452 "SearchFilter.c"
+#line 2453 "SearchFilter.c"
 			}
 		} else {
 			MediaSource* _tmp28_ = NULL;
@@ -2456,7 +2457,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_tmp28_ = source;
 #line 204 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, TYPE_PHOTO)) {
-#line 2460 "SearchFilter.c"
+#line 2461 "SearchFilter.c"
 				Photo* photo = NULL;
 				MediaSource* _tmp29_ = NULL;
 				Photo* _tmp30_ = NULL;
@@ -2474,7 +2475,7 @@ 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 2478 "SearchFilter.c"
+#line 2479 "SearchFilter.c"
 					Photo* _tmp33_ = NULL;
 					gboolean _tmp34_ = FALSE;
 #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2483,7 +2484,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 					_tmp34_ = photo_is_raw_developer_available (_tmp33_, RAW_DEVELOPER_CAMERA);
 #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp34_) {
-#line 2487 "SearchFilter.c"
+#line 2488 "SearchFilter.c"
 						gboolean _tmp35_ = FALSE;
 						gboolean _tmp36_ = FALSE;
 						gboolean _tmp37_ = FALSE;
@@ -2493,7 +2494,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 						_tmp37_ = _tmp36_;
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						if (!_tmp37_) {
-#line 2497 "SearchFilter.c"
+#line 2498 "SearchFilter.c"
 							gboolean _tmp38_ = FALSE;
 							gboolean _tmp39_ = FALSE;
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2502,11 +2503,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 							_tmp39_ = _tmp38_;
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							_tmp35_ = !_tmp39_;
-#line 2506 "SearchFilter.c"
+#line 2507 "SearchFilter.c"
 						} else {
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							_tmp35_ = FALSE;
-#line 2510 "SearchFilter.c"
+#line 2511 "SearchFilter.c"
 						}
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						if (_tmp35_) {
@@ -2518,7 +2519,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 							_g_object_unref0 (source);
 #line 209 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							return result;
-#line 2522 "SearchFilter.c"
+#line 2523 "SearchFilter.c"
 						}
 					} else {
 						gboolean _tmp40_ = FALSE;
@@ -2537,7 +2538,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 							_g_object_unref0 (source);
 #line 211 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							return result;
-#line 2541 "SearchFilter.c"
+#line 2542 "SearchFilter.c"
 						}
 					}
 				} else {
@@ -2557,12 +2558,12 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 						_g_object_unref0 (source);
 #line 214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						return result;
-#line 2561 "SearchFilter.c"
+#line 2562 "SearchFilter.c"
 					}
 				}
 #line 204 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (photo);
-#line 2566 "SearchFilter.c"
+#line 2567 "SearchFilter.c"
 			}
 		}
 	}
@@ -2570,21 +2571,21 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 	_tmp45_ = criteria;
 #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((SEARCH_FILTER_CRITERIA_TEXT & _tmp45_) != 0) {
-#line 2574 "SearchFilter.c"
+#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 2580 "SearchFilter.c"
+#line 2581 "SearchFilter.c"
 	} else {
 #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp44_ = FALSE;
-#line 2584 "SearchFilter.c"
+#line 2585 "SearchFilter.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp44_) {
-#line 2588 "SearchFilter.c"
+#line 2589 "SearchFilter.c"
 		const gchar* media_keywords = NULL;
 		MediaSource* _tmp47_ = NULL;
 		const gchar* _tmp48_ = NULL;
@@ -2620,7 +2621,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 		_tmp51_ = event;
 #line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp51_ != NULL) {
-#line 2624 "SearchFilter.c"
+#line 2625 "SearchFilter.c"
 			Event* _tmp52_ = NULL;
 			const gchar* _tmp53_ = NULL;
 #line 225 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2629,7 +2630,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_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 2633 "SearchFilter.c"
+#line 2634 "SearchFilter.c"
 		}
 #line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp54_ = tag_global;
@@ -2643,7 +2644,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 		_tmp58_ = tags;
 #line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp58_ != NULL) {
-#line 2647 "SearchFilter.c"
+#line 2648 "SearchFilter.c"
 			GeeList* _tmp59_ = NULL;
 			gint _tmp60_ = 0;
 			gint _tmp61_ = 0;
@@ -2655,17 +2656,17 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_tmp61_ = _tmp60_;
 #line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp57_ = _tmp61_;
-#line 2659 "SearchFilter.c"
+#line 2660 "SearchFilter.c"
 		} else {
 #line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp57_ = 0;
-#line 2663 "SearchFilter.c"
+#line 2664 "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 2669 "SearchFilter.c"
+#line 2670 "SearchFilter.c"
 		{
 			gchar** word_collection = NULL;
 			gint word_collection_length1 = 0;
@@ -2677,11 +2678,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			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 2681 "SearchFilter.c"
+#line 2682 "SearchFilter.c"
 				const gchar* word = NULL;
 #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				word = word_collection[word_it];
-#line 2685 "SearchFilter.c"
+#line 2686 "SearchFilter.c"
 				{
 					gboolean _tmp64_ = FALSE;
 					const gchar* _tmp65_ = NULL;
@@ -2692,7 +2693,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 					_tmp65_ = media_keywords;
 #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp65_ != NULL) {
-#line 2696 "SearchFilter.c"
+#line 2697 "SearchFilter.c"
 						const gchar* _tmp66_ = NULL;
 						const gchar* _tmp67_ = NULL;
 						gboolean _tmp68_ = FALSE;
@@ -2704,23 +2705,23 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 						_tmp68_ = string_contains (_tmp66_, _tmp67_);
 #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp64_ = _tmp68_;
-#line 2708 "SearchFilter.c"
+#line 2709 "SearchFilter.c"
 					} else {
 #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp64_ = FALSE;
-#line 2712 "SearchFilter.c"
+#line 2713 "SearchFilter.c"
 					}
 #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp64_) {
 #line 232 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						continue;
-#line 2718 "SearchFilter.c"
+#line 2719 "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 2724 "SearchFilter.c"
+#line 2725 "SearchFilter.c"
 						const gchar* _tmp71_ = NULL;
 						const gchar* _tmp72_ = NULL;
 						gboolean _tmp73_ = FALSE;
@@ -2732,40 +2733,40 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 						_tmp73_ = string_contains (_tmp71_, _tmp72_);
 #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp69_ = _tmp73_;
-#line 2736 "SearchFilter.c"
+#line 2737 "SearchFilter.c"
 					} else {
 #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp69_ = FALSE;
-#line 2740 "SearchFilter.c"
+#line 2741 "SearchFilter.c"
 					}
 #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp69_) {
 #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						continue;
-#line 2746 "SearchFilter.c"
+#line 2747 "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 2752 "SearchFilter.c"
+#line 2753 "SearchFilter.c"
 						gboolean found = FALSE;
 						gboolean _tmp90_ = FALSE;
 #line 238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						found = FALSE;
-#line 2757 "SearchFilter.c"
+#line 2758 "SearchFilter.c"
 						{
 							gint ctr = 0;
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							ctr = 0;
-#line 2762 "SearchFilter.c"
+#line 2763 "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"
 								while (TRUE) {
-#line 2769 "SearchFilter.c"
+#line 2770 "SearchFilter.c"
 									gint _tmp77_ = 0;
 									gint _tmp78_ = 0;
 									const gchar* tag_keywords = NULL;
@@ -2779,13 +2780,13 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 									const gchar* _tmp86_ = NULL;
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									if (!_tmp75_) {
-#line 2783 "SearchFilter.c"
+#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 2789 "SearchFilter.c"
+#line 2790 "SearchFilter.c"
 									}
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									_tmp75_ = FALSE;
@@ -2797,7 +2798,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 									if (!(_tmp77_ < _tmp78_)) {
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										break;
-#line 2801 "SearchFilter.c"
+#line 2802 "SearchFilter.c"
 									}
 #line 240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									_tmp79_ = tags;
@@ -2819,7 +2820,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 									_tmp86_ = tag_keywords;
 #line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									if (_tmp86_ != NULL) {
-#line 2823 "SearchFilter.c"
+#line 2824 "SearchFilter.c"
 										const gchar* _tmp87_ = NULL;
 										const gchar* _tmp88_ = NULL;
 										gboolean _tmp89_ = FALSE;
@@ -2831,11 +2832,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 										_tmp89_ = string_contains (_tmp87_, _tmp88_);
 #line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										_tmp85_ = _tmp89_;
-#line 2835 "SearchFilter.c"
+#line 2836 "SearchFilter.c"
 									} else {
 #line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										_tmp85_ = FALSE;
-#line 2839 "SearchFilter.c"
+#line 2840 "SearchFilter.c"
 									}
 #line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									if (_tmp85_) {
@@ -2843,7 +2844,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 										found = TRUE;
 #line 244 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										break;
-#line 2847 "SearchFilter.c"
+#line 2848 "SearchFilter.c"
 									}
 								}
 							}
@@ -2854,7 +2855,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 						if (_tmp90_) {
 #line 249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							continue;
-#line 2858 "SearchFilter.c"
+#line 2859 "SearchFilter.c"
 						}
 					}
 #line 254 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2867,7 +2868,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 					_g_object_unref0 (source);
 #line 254 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					return result;
-#line 2871 "SearchFilter.c"
+#line 2872 "SearchFilter.c"
 				}
 			}
 		}
@@ -2875,27 +2876,27 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 		_g_object_unref0 (tags);
 #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (event);
-#line 2879 "SearchFilter.c"
+#line 2880 "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 2885 "SearchFilter.c"
+#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 2891 "SearchFilter.c"
+#line 2892 "SearchFilter.c"
 	} else {
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp91_ = FALSE;
-#line 2895 "SearchFilter.c"
+#line 2896 "SearchFilter.c"
 	}
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp91_) {
-#line 2899 "SearchFilter.c"
+#line 2900 "SearchFilter.c"
 		SavedSearch* _tmp94_ = NULL;
 		SavedSearch* _tmp95_ = NULL;
 		MediaSource* _tmp96_ = NULL;
@@ -2914,7 +2915,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 		_g_object_unref0 (source);
 #line 260 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return result;
-#line 2918 "SearchFilter.c"
+#line 2919 "SearchFilter.c"
 	}
 #line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = TRUE;
@@ -2922,7 +2923,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 	_g_object_unref0 (source);
 #line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2926 "SearchFilter.c"
+#line 2927 "SearchFilter.c"
 }
 
 
@@ -2932,7 +2933,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 2936 "SearchFilter.c"
+#line 2937 "SearchFilter.c"
 }
 
 
@@ -2940,8 +2941,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 = default_search_view_filter_real_predicate;
-#line 2945 "SearchFilter.c"
+	((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) default_search_view_filter_real_predicate;
+#line 2946 "SearchFilter.c"
 }
 
 
@@ -2972,7 +2973,7 @@ static gboolean disabled_view_filter_real_predicate (ViewFilter* base, DataView*
 	result = TRUE;
 #line 269 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2976 "SearchFilter.c"
+#line 2977 "SearchFilter.c"
 }
 
 
@@ -2985,7 +2986,7 @@ static guint disabled_view_filter_real_get_criteria (SearchViewFilter* base) {
 	result = (guint) SEARCH_FILTER_CRITERIA_RATING;
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2989 "SearchFilter.c"
+#line 2990 "SearchFilter.c"
 }
 
 
@@ -2995,14 +2996,14 @@ DisabledViewFilter* disabled_view_filter_construct (GType object_type) {
 	self = (DisabledViewFilter*) search_view_filter_construct (object_type);
 #line 267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 2999 "SearchFilter.c"
+#line 3000 "SearchFilter.c"
 }
 
 
 DisabledViewFilter* disabled_view_filter_new (void) {
 #line 267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return disabled_view_filter_construct (TYPE_DISABLED_VIEW_FILTER);
-#line 3006 "SearchFilter.c"
+#line 3007 "SearchFilter.c"
 }
 
 
@@ -3010,10 +3011,10 @@ static void disabled_view_filter_class_init (DisabledViewFilterClass * klass) {
 #line 267 "/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 = disabled_view_filter_real_predicate;
+	((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) disabled_view_filter_real_predicate;
 #line 267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	((SearchViewFilterClass *) klass)->get_criteria = disabled_view_filter_real_get_criteria;
-#line 3017 "SearchFilter.c"
+	((SearchViewFilterClass *) klass)->get_criteria = (guint (*)(SearchViewFilter*)) disabled_view_filter_real_get_criteria;
+#line 3018 "SearchFilter.c"
 }
 
 
@@ -3049,14 +3050,14 @@ TextAction* text_action_construct (GType object_type, const gchar* init) {
 	self->priv->text = _tmp1_;
 #line 294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 3053 "SearchFilter.c"
+#line 3054 "SearchFilter.c"
 }
 
 
 TextAction* text_action_new (const gchar* init) {
 #line 294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return text_action_construct (TYPE_TEXT_ACTION, init);
-#line 3060 "SearchFilter.c"
+#line 3061 "SearchFilter.c"
 }
 
 
@@ -3071,7 +3072,7 @@ void text_action_set_text (TextAction* self, const gchar* text) {
 	_tmp1_ = text;
 #line 299 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (g_strcmp0 (_tmp0_, _tmp1_) != 0) {
-#line 3075 "SearchFilter.c"
+#line 3076 "SearchFilter.c"
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
@@ -3087,7 +3088,7 @@ void text_action_set_text (TextAction* self, const gchar* text) {
 		_tmp4_ = text;
 #line 301 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_signal_emit_by_name (self, "text-changed", _tmp4_);
-#line 3091 "SearchFilter.c"
+#line 3092 "SearchFilter.c"
 	}
 }
 
@@ -3097,7 +3098,7 @@ void text_action_clear (TextAction* self) {
 	g_return_if_fail (IS_TEXT_ACTION (self));
 #line 306 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	text_action_set_text (self, NULL);
-#line 3101 "SearchFilter.c"
+#line 3102 "SearchFilter.c"
 }
 
 
@@ -3112,7 +3113,7 @@ gboolean text_action_is_sensitive (TextAction* self) {
 	result = _tmp0_;
 #line 310 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3116 "SearchFilter.c"
+#line 3117 "SearchFilter.c"
 }
 
 
@@ -3127,7 +3128,7 @@ void text_action_set_sensitive (TextAction* self, gboolean sensitive) {
 	_tmp1_ = sensitive;
 #line 314 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_ != _tmp1_) {
-#line 3131 "SearchFilter.c"
+#line 3132 "SearchFilter.c"
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_ = FALSE;
 #line 315 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3138,7 +3139,7 @@ void text_action_set_sensitive (TextAction* self, gboolean sensitive) {
 		_tmp3_ = sensitive;
 #line 316 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_signal_emit_by_name (self, "sensitivity-changed", _tmp3_);
-#line 3142 "SearchFilter.c"
+#line 3143 "SearchFilter.c"
 	}
 }
 
@@ -3154,7 +3155,7 @@ gboolean text_action_is_visible (TextAction* self) {
 	result = _tmp0_;
 #line 321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3158 "SearchFilter.c"
+#line 3159 "SearchFilter.c"
 }
 
 
@@ -3169,7 +3170,7 @@ void text_action_set_visible (TextAction* self, gboolean visible) {
 	_tmp1_ = visible;
 #line 325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_ != _tmp1_) {
-#line 3173 "SearchFilter.c"
+#line 3174 "SearchFilter.c"
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_ = FALSE;
 #line 326 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3180,7 +3181,7 @@ void text_action_set_visible (TextAction* self, gboolean visible) {
 		_tmp3_ = visible;
 #line 327 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_signal_emit_by_name (self, "visibility-changed", _tmp3_);
-#line 3184 "SearchFilter.c"
+#line 3185 "SearchFilter.c"
 	}
 }
 
@@ -3196,14 +3197,14 @@ const gchar* text_action_get_value (TextAction* self) {
 	result = _tmp0_;
 #line 280 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3200 "SearchFilter.c"
+#line 3201 "SearchFilter.c"
 }
 
 
 static void value_text_action_init (GValue* value) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	value->data[0].v_pointer = NULL;
-#line 3207 "SearchFilter.c"
+#line 3208 "SearchFilter.c"
 }
 
 
@@ -3212,7 +3213,7 @@ static void value_text_action_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_unref (value->data[0].v_pointer);
-#line 3216 "SearchFilter.c"
+#line 3217 "SearchFilter.c"
 	}
 }
 
@@ -3222,11 +3223,11 @@ static void value_text_action_copy_value (const GValue* src_value, GValue* dest_
 	if (src_value->data[0].v_pointer) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = text_action_ref (src_value->data[0].v_pointer);
-#line 3226 "SearchFilter.c"
+#line 3227 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3230 "SearchFilter.c"
+#line 3231 "SearchFilter.c"
 	}
 }
 
@@ -3234,37 +3235,37 @@ static void value_text_action_copy_value (const GValue* src_value, GValue* dest_
 static gpointer value_text_action_peek_pointer (const GValue* value) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 3238 "SearchFilter.c"
+#line 3239 "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"
 	if (collect_values[0].v_pointer) {
-#line 3245 "SearchFilter.c"
+#line 3246 "SearchFilter.c"
 		TextAction* object;
 		object = collect_values[0].v_pointer;
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3252 "SearchFilter.c"
+#line 3253 "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"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3256 "SearchFilter.c"
+#line 3257 "SearchFilter.c"
 		}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = text_action_ref (object);
-#line 3260 "SearchFilter.c"
+#line 3261 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 3264 "SearchFilter.c"
+#line 3265 "SearchFilter.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 3268 "SearchFilter.c"
+#line 3269 "SearchFilter.c"
 }
 
 
@@ -3275,25 +3276,25 @@ static gchar* value_text_action_lcopy_value (const GValue* value, guint n_collec
 	if (!object_p) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3279 "SearchFilter.c"
+#line 3280 "SearchFilter.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!value->data[0].v_pointer) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = NULL;
-#line 3285 "SearchFilter.c"
+#line 3286 "SearchFilter.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3289 "SearchFilter.c"
+#line 3290 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = text_action_ref (value->data[0].v_pointer);
-#line 3293 "SearchFilter.c"
+#line 3294 "SearchFilter.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 3297 "SearchFilter.c"
+#line 3298 "SearchFilter.c"
 }
 
 
@@ -3307,7 +3308,7 @@ GParamSpec* param_spec_text_action (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return G_PARAM_SPEC (spec);
-#line 3311 "SearchFilter.c"
+#line 3312 "SearchFilter.c"
 }
 
 
@@ -3316,7 +3317,7 @@ gpointer value_get_text_action (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ACTION), NULL);
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 3320 "SearchFilter.c"
+#line 3321 "SearchFilter.c"
 }
 
 
@@ -3336,17 +3337,17 @@ void value_set_text_action (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_ref (value->data[0].v_pointer);
-#line 3340 "SearchFilter.c"
+#line 3341 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 3344 "SearchFilter.c"
+#line 3345 "SearchFilter.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_unref (old);
-#line 3350 "SearchFilter.c"
+#line 3351 "SearchFilter.c"
 	}
 }
 
@@ -3365,17 +3366,17 @@ void value_take_text_action (GValue* value, gpointer v_object) {
 		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"
 		value->data[0].v_pointer = v_object;
-#line 3369 "SearchFilter.c"
+#line 3370 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 3373 "SearchFilter.c"
+#line 3374 "SearchFilter.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_unref (old);
-#line 3379 "SearchFilter.c"
+#line 3380 "SearchFilter.c"
 	}
 }
 
@@ -3393,7 +3394,7 @@ static void text_action_class_init (TextActionClass * klass) {
 	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 3397 "SearchFilter.c"
+#line 3398 "SearchFilter.c"
 }
 
 
@@ -3408,7 +3409,7 @@ static void text_action_instance_init (TextAction * self) {
 	self->priv->visible = TRUE;
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->ref_count = 1;
-#line 3412 "SearchFilter.c"
+#line 3413 "SearchFilter.c"
 }
 
 
@@ -3420,7 +3421,7 @@ static void text_action_finalize (TextAction* obj) {
 	g_signal_handlers_destroy (self);
 #line 284 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_free0 (self->priv->text);
-#line 3424 "SearchFilter.c"
+#line 3425 "SearchFilter.c"
 }
 
 
@@ -3445,7 +3446,7 @@ gpointer text_action_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return instance;
-#line 3449 "SearchFilter.c"
+#line 3450 "SearchFilter.c"
 }
 
 
@@ -3458,7 +3459,7 @@ void text_action_unref (gpointer instance) {
 		TEXT_ACTION_GET_CLASS (self)->finalize (self);
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3462 "SearchFilter.c"
+#line 3463 "SearchFilter.c"
 	}
 }
 
@@ -3466,56 +3467,56 @@ void text_action_unref (gpointer instance) {
 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"
 	search_filter_actions_on_action_radio ((SearchFilterActions*) self, action, parameter);
-#line 3470 "SearchFilter.c"
+#line 3471 "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"
 	search_filter_actions_on_rating_changed ((SearchFilterActions*) self, action, value);
-#line 3477 "SearchFilter.c"
+#line 3478 "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"
 	search_filter_actions_on_action_toggle ((SearchFilterActions*) self, action, parameter);
-#line 3484 "SearchFilter.c"
+#line 3485 "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"
 	search_filter_actions_on_flagged_toggled ((SearchFilterActions*) self, action, value);
-#line 3491 "SearchFilter.c"
+#line 3492 "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"
 	search_filter_actions_on_photos_toggled ((SearchFilterActions*) self, action, value);
-#line 3498 "SearchFilter.c"
+#line 3499 "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"
 	search_filter_actions_on_videos_toggled ((SearchFilterActions*) self, action, value);
-#line 3505 "SearchFilter.c"
+#line 3506 "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"
 	search_filter_actions_on_raw_toggled ((SearchFilterActions*) self, action, value);
-#line 3512 "SearchFilter.c"
+#line 3513 "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"
 	search_filter_actions_on_text_changed ((SearchFilterActions*) self, _sender, text);
-#line 3519 "SearchFilter.c"
+#line 3520 "SearchFilter.c"
 }
 
 
@@ -3535,14 +3536,14 @@ SearchFilterActions* search_filter_actions_construct (GType object_type) {
 	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"
 	return self;
-#line 3539 "SearchFilter.c"
+#line 3540 "SearchFilter.c"
 }
 
 
 SearchFilterActions* search_filter_actions_new (void) {
 #line 406 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_actions_construct (TYPE_SEARCH_FILTER_ACTIONS);
-#line 3546 "SearchFilter.c"
+#line 3547 "SearchFilter.c"
 }
 
 
@@ -3557,7 +3558,7 @@ SearchFilterCriteria search_filter_actions_get_criteria (SearchFilterActions* se
 	result = _tmp0_;
 #line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3561 "SearchFilter.c"
+#line 3562 "SearchFilter.c"
 }
 
 
@@ -3575,13 +3576,13 @@ GActionEntry* search_filter_actions_get_actions (SearchFilterActions* self, int*
 	if (result_length1) {
 #line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*result_length1 = _tmp0__length1;
-#line 3579 "SearchFilter.c"
+#line 3580 "SearchFilter.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
 #line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3585 "SearchFilter.c"
+#line 3586 "SearchFilter.c"
 }
 
 
@@ -3603,7 +3604,7 @@ GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, cons
 	if (_tmp1_ == NULL) {
 #line 422 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp0_);
-#line 3607 "SearchFilter.c"
+#line 3608 "SearchFilter.c"
 	}
 #line 422 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	lw = _tmp1_;
@@ -3611,7 +3612,7 @@ GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, cons
 	_tmp2_ = lw;
 #line 423 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp2_ != NULL) {
-#line 3615 "SearchFilter.c"
+#line 3616 "SearchFilter.c"
 		LibraryWindow* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
 		GAction* _tmp5_ = NULL;
@@ -3627,7 +3628,7 @@ GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, cons
 		_g_object_unref0 (lw);
 #line 424 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return result;
-#line 3631 "SearchFilter.c"
+#line 3632 "SearchFilter.c"
 	}
 #line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = NULL;
@@ -3635,7 +3636,7 @@ GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, cons
 	_g_object_unref0 (lw);
 #line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3639 "SearchFilter.c"
+#line 3640 "SearchFilter.c"
 }
 
 
@@ -3661,7 +3662,7 @@ void search_filter_actions_set_action_sensitive (SearchFilterActions* self, cons
 	_tmp3_ = action;
 #line 433 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp3_ != NULL) {
-#line 3665 "SearchFilter.c"
+#line 3666 "SearchFilter.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 #line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3670,46 +3671,46 @@ void search_filter_actions_set_action_sensitive (SearchFilterActions* self, cons
 		_tmp5_ = sensitive;
 #line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 3674 "SearchFilter.c"
+#line 3675 "SearchFilter.c"
 	}
 #line 431 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (action);
-#line 3678 "SearchFilter.c"
+#line 3679 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new32 (gboolean value) {
 #line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3685 "SearchFilter.c"
+#line 3686 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new33 (gboolean value) {
 #line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3692 "SearchFilter.c"
+#line 3693 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new34 (gboolean value) {
 #line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3699 "SearchFilter.c"
+#line 3700 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new35 (gboolean value) {
 #line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3706 "SearchFilter.c"
+#line 3707 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new36 (gchar* value) {
 #line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 3713 "SearchFilter.c"
+#line 3714 "SearchFilter.c"
 }
 
 
@@ -3803,7 +3804,7 @@ void search_filter_actions_reset (SearchFilterActions* self) {
 	text_action_set_text (_tmp19_, NULL);
 #line 438 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (v);
-#line 3807 "SearchFilter.c"
+#line 3808 "SearchFilter.c"
 }
 
 
@@ -3819,21 +3820,21 @@ void search_filter_actions_set_sensitive_for_search_criteria (SearchFilterAction
 	search_filter_actions_update_sensitivities (self);
 #line 454 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "criteria-changed");
-#line 3823 "SearchFilter.c"
+#line 3824 "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"
 	search_filter_actions_on_media_tracker_updated ((SearchFilterActions*) self, _sender);
-#line 3830 "SearchFilter.c"
+#line 3831 "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"
 	search_filter_actions_on_camera_tracker_updated ((SearchFilterActions*) self, _sender);
-#line 3837 "SearchFilter.c"
+#line 3838 "SearchFilter.c"
 }
 
 
@@ -3862,7 +3863,7 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 	_tmp2_ = old_tracked_page;
 #line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp2_ != NULL) {
-#line 3866 "SearchFilter.c"
+#line 3867 "SearchFilter.c"
 		CoreViewTracker* tracker = NULL;
 		CheckerboardPage* _tmp3_ = NULL;
 		CoreViewTracker* _tmp4_ = NULL;
@@ -3877,7 +3878,7 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 		_tmp5_ = tracker;
 #line 461 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_MEDIA_VIEW_TRACKER)) {
-#line 3881 "SearchFilter.c"
+#line 3882 "SearchFilter.c"
 			CoreViewTracker* _tmp6_ = NULL;
 			guint _tmp7_ = 0U;
 #line 462 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3886,14 +3887,14 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 			g_signal_parse_name ("updated", CORE_TYPE_TRACKER, &_tmp7_, NULL, FALSE);
 #line 462 "/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 3890 "SearchFilter.c"
+#line 3891 "SearchFilter.c"
 		} else {
 			CoreViewTracker* _tmp8_ = NULL;
 #line 463 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp8_ = tracker;
 #line 463 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_CAMERA_VIEW_TRACKER)) {
-#line 3897 "SearchFilter.c"
+#line 3898 "SearchFilter.c"
 				CoreViewTracker* _tmp9_ = NULL;
 				guint _tmp10_ = 0U;
 #line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3902,12 +3903,12 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 				g_signal_parse_name ("updated", CORE_TYPE_TRACKER, &_tmp10_, NULL, FALSE);
 #line 464 "/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 3906 "SearchFilter.c"
+#line 3907 "SearchFilter.c"
 			}
 		}
 #line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_core_tracker_unref0 (tracker);
-#line 3911 "SearchFilter.c"
+#line 3912 "SearchFilter.c"
 	}
 #line 467 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = new_page;
@@ -3919,7 +3920,7 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 	_tmp13_ = new_tracked_page;
 #line 468 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp13_ != NULL) {
-#line 3923 "SearchFilter.c"
+#line 3924 "SearchFilter.c"
 		CoreViewTracker* tracker = NULL;
 		CheckerboardPage* _tmp14_ = NULL;
 		CoreViewTracker* _tmp15_ = NULL;
@@ -3936,7 +3937,7 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 		_tmp16_ = tracker;
 #line 472 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_MEDIA_VIEW_TRACKER)) {
-#line 3940 "SearchFilter.c"
+#line 3941 "SearchFilter.c"
 			CoreViewTracker* _tmp17_ = NULL;
 			CoreViewTracker* _tmp18_ = NULL;
 #line 473 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3955,14 +3956,14 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 			_g_object_unref0 (old_tracked_page);
 #line 476 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return;
-#line 3959 "SearchFilter.c"
+#line 3960 "SearchFilter.c"
 		} else {
 			CoreViewTracker* _tmp19_ = NULL;
 #line 477 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp19_ = tracker;
 #line 477 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_CAMERA_VIEW_TRACKER)) {
-#line 3966 "SearchFilter.c"
+#line 3967 "SearchFilter.c"
 				CoreViewTracker* _tmp20_ = NULL;
 				CoreViewTracker* _tmp21_ = NULL;
 #line 478 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3981,12 +3982,12 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 				_g_object_unref0 (old_tracked_page);
 #line 481 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				return;
-#line 3985 "SearchFilter.c"
+#line 3986 "SearchFilter.c"
 			}
 		}
 #line 468 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_core_tracker_unref0 (tracker);
-#line 3990 "SearchFilter.c"
+#line 3991 "SearchFilter.c"
 	}
 #line 486 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_flagged = FALSE;
@@ -4004,14 +4005,14 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 	_g_object_unref0 (new_tracked_page);
 #line 457 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (old_tracked_page);
-#line 4008 "SearchFilter.c"
+#line 4009 "SearchFilter.c"
 }
 
 
 static gpointer _core_tracker_ref0 (gpointer self) {
 #line 496 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 4015 "SearchFilter.c"
+#line 4016 "SearchFilter.c"
 }
 
 
@@ -4065,7 +4066,7 @@ static void search_filter_actions_on_media_tracker_updated (SearchFilterActions*
 	search_filter_actions_update_sensitivities (self);
 #line 495 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_core_tracker_unref0 (tracker);
-#line 4069 "SearchFilter.c"
+#line 4070 "SearchFilter.c"
 }
 
 
@@ -4122,7 +4123,7 @@ static void search_filter_actions_on_camera_tracker_updated (SearchFilterActions
 	search_filter_actions_update_sensitivities (self);
 #line 506 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_core_tracker_unref0 (tracker);
-#line 4126 "SearchFilter.c"
+#line 4127 "SearchFilter.c"
 }
 
 
@@ -4162,7 +4163,7 @@ static void search_filter_actions_update_sensitivities (SearchFilterActions* sel
 	_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 4166 "SearchFilter.c"
+#line 4167 "SearchFilter.c"
 }
 
 
@@ -4176,7 +4177,7 @@ static void search_filter_actions_on_text_changed (SearchFilterActions* self, Te
 	_tmp0_ = text;
 #line 529 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "text-changed", _tmp0_);
-#line 4180 "SearchFilter.c"
+#line 4181 "SearchFilter.c"
 }
 
 
@@ -4193,21 +4194,21 @@ static void search_filter_actions_on_action_radio (SearchFilterActions* self, GS
 	_tmp1_ = parameter;
 #line 542 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (_tmp0_, "change-state", _tmp1_);
-#line 4197 "SearchFilter.c"
+#line 4198 "SearchFilter.c"
 }
 
 
 static gboolean _variant_get37 (GVariant* value) {
 #line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_get_boolean (value);
-#line 4204 "SearchFilter.c"
+#line 4205 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new38 (gboolean value) {
 #line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4211 "SearchFilter.c"
+#line 4212 "SearchFilter.c"
 }
 
 
@@ -4246,7 +4247,7 @@ static void search_filter_actions_on_action_toggle (SearchFilterActions* self, G
 	g_signal_emit_by_name (_tmp5_, "change-state", _tmp6_);
 #line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp6_);
-#line 4250 "SearchFilter.c"
+#line 4251 "SearchFilter.c"
 }
 
 
@@ -4260,7 +4261,7 @@ static void search_filter_actions_register (SearchFilterActions* self) {
 	_text_action_unref0 (self->priv->_text);
 #line 552 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_text = _tmp0_;
-#line 4264 "SearchFilter.c"
+#line 4265 "SearchFilter.c"
 }
 
 
@@ -4305,7 +4306,7 @@ static void search_filter_actions_on_rating_changed (SearchFilterActions* self,
 	if (_tmp6_) {
 #line 558 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return;
-#line 4309 "SearchFilter.c"
+#line 4310 "SearchFilter.c"
 	}
 #line 560 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = value;
@@ -4325,7 +4326,7 @@ static void search_filter_actions_on_rating_changed (SearchFilterActions* self,
 	_tmp12_ = filter;
 #line 562 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "rating-changed", _tmp12_);
-#line 4329 "SearchFilter.c"
+#line 4330 "SearchFilter.c"
 }
 
 
@@ -4352,7 +4353,7 @@ static void search_filter_actions_on_flagged_toggled (SearchFilterActions* self,
 	_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 4356 "SearchFilter.c"
+#line 4357 "SearchFilter.c"
 }
 
 
@@ -4379,7 +4380,7 @@ static void search_filter_actions_on_photos_toggled (SearchFilterActions* self,
 	_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 4383 "SearchFilter.c"
+#line 4384 "SearchFilter.c"
 }
 
 
@@ -4406,7 +4407,7 @@ static void search_filter_actions_on_videos_toggled (SearchFilterActions* self,
 	_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 4410 "SearchFilter.c"
+#line 4411 "SearchFilter.c"
 }
 
 
@@ -4433,7 +4434,7 @@ static void search_filter_actions_on_raw_toggled (SearchFilterActions* self, GSi
 	_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 4437 "SearchFilter.c"
+#line 4438 "SearchFilter.c"
 }
 
 
@@ -4448,7 +4449,7 @@ gboolean search_filter_actions_get_has_photos (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 590 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4452 "SearchFilter.c"
+#line 4453 "SearchFilter.c"
 }
 
 
@@ -4463,7 +4464,7 @@ gboolean search_filter_actions_get_has_videos (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 594 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4467 "SearchFilter.c"
+#line 4468 "SearchFilter.c"
 }
 
 
@@ -4478,7 +4479,7 @@ gboolean search_filter_actions_get_has_raw (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4482 "SearchFilter.c"
+#line 4483 "SearchFilter.c"
 }
 
 
@@ -4493,7 +4494,7 @@ gboolean search_filter_actions_get_has_flagged (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4497 "SearchFilter.c"
+#line 4498 "SearchFilter.c"
 }
 
 
@@ -4508,7 +4509,7 @@ GSimpleAction* search_filter_actions_get_flagged (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 336 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4512 "SearchFilter.c"
+#line 4513 "SearchFilter.c"
 }
 
 
@@ -4523,7 +4524,7 @@ GSimpleAction* search_filter_actions_get_photos (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4527 "SearchFilter.c"
+#line 4528 "SearchFilter.c"
 }
 
 
@@ -4538,7 +4539,7 @@ GSimpleAction* search_filter_actions_get_videos (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4542 "SearchFilter.c"
+#line 4543 "SearchFilter.c"
 }
 
 
@@ -4553,7 +4554,7 @@ GSimpleAction* search_filter_actions_get_raw (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4557 "SearchFilter.c"
+#line 4558 "SearchFilter.c"
 }
 
 
@@ -4568,7 +4569,7 @@ GSimpleAction* search_filter_actions_get_rating (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 360 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4572 "SearchFilter.c"
+#line 4573 "SearchFilter.c"
 }
 
 
@@ -4588,7 +4589,7 @@ TextAction* search_filter_actions_get_text (SearchFilterActions* self) {
 	result = _tmp1_;
 #line 367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4592 "SearchFilter.c"
+#line 4593 "SearchFilter.c"
 }
 
 
@@ -4607,26 +4608,26 @@ static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN (GClos
 		data1 = closure->data;
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4611 "SearchFilter.c"
+#line 4612 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		data2 = closure->data;
-#line 4617 "SearchFilter.c"
+#line 4618 "SearchFilter.c"
 	}
 #line 333 "/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"
 	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 4623 "SearchFilter.c"
+#line 4624 "SearchFilter.c"
 }
 
 
 static void value_search_filter_actions_init (GValue* value) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	value->data[0].v_pointer = NULL;
-#line 4630 "SearchFilter.c"
+#line 4631 "SearchFilter.c"
 }
 
 
@@ -4635,7 +4636,7 @@ static void value_search_filter_actions_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_actions_unref (value->data[0].v_pointer);
-#line 4639 "SearchFilter.c"
+#line 4640 "SearchFilter.c"
 	}
 }
 
@@ -4645,11 +4646,11 @@ static void value_search_filter_actions_copy_value (const GValue* src_value, GVa
 	if (src_value->data[0].v_pointer) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = search_filter_actions_ref (src_value->data[0].v_pointer);
-#line 4649 "SearchFilter.c"
+#line 4650 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4653 "SearchFilter.c"
+#line 4654 "SearchFilter.c"
 	}
 }
 
@@ -4657,37 +4658,37 @@ static void value_search_filter_actions_copy_value (const GValue* src_value, GVa
 static gpointer value_search_filter_actions_peek_pointer (const GValue* value) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 4661 "SearchFilter.c"
+#line 4662 "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"
 	if (collect_values[0].v_pointer) {
-#line 4668 "SearchFilter.c"
+#line 4669 "SearchFilter.c"
 		SearchFilterActions* object;
 		object = collect_values[0].v_pointer;
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4675 "SearchFilter.c"
+#line 4676 "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"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4679 "SearchFilter.c"
+#line 4680 "SearchFilter.c"
 		}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = search_filter_actions_ref (object);
-#line 4683 "SearchFilter.c"
+#line 4684 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 4687 "SearchFilter.c"
+#line 4688 "SearchFilter.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 4691 "SearchFilter.c"
+#line 4692 "SearchFilter.c"
 }
 
 
@@ -4698,25 +4699,25 @@ static gchar* value_search_filter_actions_lcopy_value (const GValue* value, guin
 	if (!object_p) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4702 "SearchFilter.c"
+#line 4703 "SearchFilter.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!value->data[0].v_pointer) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = NULL;
-#line 4708 "SearchFilter.c"
+#line 4709 "SearchFilter.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4712 "SearchFilter.c"
+#line 4713 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = search_filter_actions_ref (value->data[0].v_pointer);
-#line 4716 "SearchFilter.c"
+#line 4717 "SearchFilter.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 4720 "SearchFilter.c"
+#line 4721 "SearchFilter.c"
 }
 
 
@@ -4730,7 +4731,7 @@ GParamSpec* param_spec_search_filter_actions (const gchar* name, const gchar* ni
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return G_PARAM_SPEC (spec);
-#line 4734 "SearchFilter.c"
+#line 4735 "SearchFilter.c"
 }
 
 
@@ -4739,7 +4740,7 @@ gpointer value_get_search_filter_actions (const GValue* value) {
 	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"
 	return value->data[0].v_pointer;
-#line 4743 "SearchFilter.c"
+#line 4744 "SearchFilter.c"
 }
 
 
@@ -4759,17 +4760,17 @@ void value_set_search_filter_actions (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_actions_ref (value->data[0].v_pointer);
-#line 4763 "SearchFilter.c"
+#line 4764 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 4767 "SearchFilter.c"
+#line 4768 "SearchFilter.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_actions_unref (old);
-#line 4773 "SearchFilter.c"
+#line 4774 "SearchFilter.c"
 	}
 }
 
@@ -4788,17 +4789,17 @@ void value_take_search_filter_actions (GValue* value, gpointer v_object) {
 		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"
 		value->data[0].v_pointer = v_object;
-#line 4792 "SearchFilter.c"
+#line 4793 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 4796 "SearchFilter.c"
+#line 4797 "SearchFilter.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_actions_unref (old);
-#line 4802 "SearchFilter.c"
+#line 4803 "SearchFilter.c"
 	}
 }
 
@@ -4822,7 +4823,7 @@ static void search_filter_actions_class_init (SearchFilterActionsClass * klass)
 	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 4826 "SearchFilter.c"
+#line 4827 "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
@@ -4832,7 +4833,7 @@ static void search_filter_actions_class_init (SearchFilterActionsClass * klass)
 	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 4836 "SearchFilter.c"
+#line 4837 "SearchFilter.c"
 }
 
 
@@ -4855,7 +4856,7 @@ static void search_filter_actions_instance_init (SearchFilterActions * self) {
 	self->priv->can_filter_by_stars = TRUE;
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->ref_count = 1;
-#line 4859 "SearchFilter.c"
+#line 4860 "SearchFilter.c"
 }
 
 
@@ -4867,7 +4868,7 @@ static void search_filter_actions_finalize (SearchFilterActions* obj) {
 	g_signal_handlers_destroy (self);
 #line 372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_text_action_unref0 (self->priv->_text);
-#line 4871 "SearchFilter.c"
+#line 4872 "SearchFilter.c"
 }
 
 
@@ -4892,7 +4893,7 @@ gpointer search_filter_actions_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return instance;
-#line 4896 "SearchFilter.c"
+#line 4897 "SearchFilter.c"
 }
 
 
@@ -4905,7 +4906,7 @@ void search_filter_actions_unref (gpointer instance) {
 		SEARCH_FILTER_ACTIONS_GET_CLASS (self)->finalize (self);
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4909 "SearchFilter.c"
+#line 4910 "SearchFilter.c"
 	}
 }
 
@@ -4913,56 +4914,56 @@ void search_filter_actions_unref (gpointer instance) {
 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"
 	search_filter_toolbar_on_media_context_changed ((SearchFilterToolbar*) self, has_photos, has_videos, has_raw, has_flagged);
-#line 4917 "SearchFilter.c"
+#line 4918 "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"
 	search_filter_toolbar_on_flagged_toggled ((SearchFilterToolbar*) self);
-#line 4924 "SearchFilter.c"
+#line 4925 "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"
 	search_filter_toolbar_on_photos_toggled ((SearchFilterToolbar*) self);
-#line 4931 "SearchFilter.c"
+#line 4932 "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"
 	search_filter_toolbar_on_videos_toggled ((SearchFilterToolbar*) self);
-#line 4938 "SearchFilter.c"
+#line 4939 "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"
 	search_filter_toolbar_on_raw_toggled ((SearchFilterToolbar*) self);
-#line 4945 "SearchFilter.c"
+#line 4946 "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"
 	search_filter_toolbar_on_rating_changed ((SearchFilterToolbar*) self);
-#line 4952 "SearchFilter.c"
+#line 4953 "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"
 	search_filter_toolbar_on_search_text_changed ((SearchFilterToolbar*) self);
-#line 4959 "SearchFilter.c"
+#line 4960 "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"
 	search_filter_toolbar_on_criteria_changed ((SearchFilterToolbar*) self);
-#line 4966 "SearchFilter.c"
+#line 4967 "SearchFilter.c"
 }
 
 
@@ -4971,28 +4972,28 @@ static gboolean _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_pop
 	result = search_filter_toolbar_on_context_menu_requested ((SearchFilterToolbar*) self, x, y, button_number);
 #line 1168 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4975 "SearchFilter.c"
+#line 4976 "SearchFilter.c"
 }
 
 
 static gpointer _search_filter_actions_ref0 (gpointer self) {
 #line 1053 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? search_filter_actions_ref (self) : NULL;
-#line 4982 "SearchFilter.c"
+#line 4983 "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"
 	search_filter_toolbar_on_context_menu_close_chosen ((SearchFilterToolbar*) self);
-#line 4989 "SearchFilter.c"
+#line 4990 "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"
 	search_filter_toolbar_on_saved_search_button_clicked ((SearchFilterToolbar*) self);
-#line 4996 "SearchFilter.c"
+#line 4997 "SearchFilter.c"
 }
 
 
@@ -5136,7 +5137,7 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 	_tmp9_ = self->priv->toolbar;
 #line 1059 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_toolbar_set_icon_size (_tmp9_, GTK_ICON_SIZE_SMALL_TOOLBAR);
-#line 5140 "SearchFilter.c"
+#line 5141 "SearchFilter.c"
 	{
 		GtkBuilder* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
@@ -5153,7 +5154,7 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 		_g_free0 (_tmp12_);
 #line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5157 "SearchFilter.c"
+#line 5158 "SearchFilter.c"
 			goto __catch592_g_error;
 		}
 	}
@@ -5186,7 +5187,7 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 		_g_free0 (_tmp17_);
 #line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_error_free0 (err);
-#line 5190 "SearchFilter.c"
+#line 5191 "SearchFilter.c"
 	}
 	__finally592:
 #line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -5197,7 +5198,7 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 		g_clear_error (&_inner_error_);
 #line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return NULL;
-#line 5201 "SearchFilter.c"
+#line 5202 "SearchFilter.c"
 	}
 #line 1073 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp18_ = self->priv->close_item;
@@ -5501,14 +5502,14 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 	_g_object_unref0 (model);
 #line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 5505 "SearchFilter.c"
+#line 5506 "SearchFilter.c"
 }
 
 
 SearchFilterToolbar* search_filter_toolbar_new (SearchFilterActions* actions) {
 #line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_construct (TYPE_SEARCH_FILTER_TOOLBAR, actions);
-#line 5512 "SearchFilter.c"
+#line 5513 "SearchFilter.c"
 }
 
 
@@ -5523,77 +5524,77 @@ static void search_filter_toolbar_on_media_context_changed (SearchFilterToolbar*
 	_tmp0_ = has_photos;
 #line 1173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_) {
-#line 5527 "SearchFilter.c"
+#line 5528 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp1_ = NULL;
 #line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp1_ = 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 5533 "SearchFilter.c"
+#line 5534 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp2_ = NULL;
 #line 1176 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = self->priv->toolbtn_photos;
 #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 5540 "SearchFilter.c"
+#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 5546 "SearchFilter.c"
+#line 5547 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp4_ = NULL;
 #line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = 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 5552 "SearchFilter.c"
+#line 5553 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp5_ = NULL;
 #line 1181 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = self->priv->toolbtn_videos;
 #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 5559 "SearchFilter.c"
+#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 5565 "SearchFilter.c"
+#line 5566 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp7_ = NULL;
 #line 1184 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp7_ = 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 5571 "SearchFilter.c"
+#line 5572 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp8_ = NULL;
 #line 1186 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp8_ = self->priv->toolbtn_raw;
 #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 5578 "SearchFilter.c"
+#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 5584 "SearchFilter.c"
+#line 5585 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp10_ = NULL;
 #line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp10_ = 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 5590 "SearchFilter.c"
+#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 5597 "SearchFilter.c"
+#line 5598 "SearchFilter.c"
 	}
 }
 
@@ -5617,14 +5618,14 @@ static gboolean search_filter_toolbar_on_context_menu_requested (SearchFilterToo
 	result = FALSE;
 #line 1197 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 5621 "SearchFilter.c"
+#line 5622 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new39 (gboolean value) {
 #line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5628 "SearchFilter.c"
+#line 5629 "SearchFilter.c"
 }
 
 
@@ -5654,7 +5655,7 @@ static void search_filter_toolbar_on_context_menu_close_chosen (SearchFilterTool
 	_tmp4_ = action;
 #line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp4_ != NULL) {
-#line 5658 "SearchFilter.c"
+#line 5659 "SearchFilter.c"
 		GSimpleAction* _tmp5_ = NULL;
 		GVariant* _tmp6_ = NULL;
 #line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -5665,13 +5666,13 @@ static void search_filter_toolbar_on_context_menu_close_chosen (SearchFilterTool
 		g_signal_emit_by_name (_tmp5_, "change-state", _tmp6_);
 #line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_variant_unref0 (_tmp6_);
-#line 5669 "SearchFilter.c"
+#line 5670 "SearchFilter.c"
 	}
 #line 1202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (action);
 #line 1202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (aw);
-#line 5675 "SearchFilter.c"
+#line 5676 "SearchFilter.c"
 }
 
 
@@ -5680,7 +5681,7 @@ static void search_filter_toolbar_on_flagged_toggled (SearchFilterToolbar* self)
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5684 "SearchFilter.c"
+#line 5685 "SearchFilter.c"
 }
 
 
@@ -5689,7 +5690,7 @@ static void search_filter_toolbar_on_videos_toggled (SearchFilterToolbar* self)
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1223 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5693 "SearchFilter.c"
+#line 5694 "SearchFilter.c"
 }
 
 
@@ -5698,7 +5699,7 @@ static void search_filter_toolbar_on_photos_toggled (SearchFilterToolbar* self)
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5702 "SearchFilter.c"
+#line 5703 "SearchFilter.c"
 }
 
 
@@ -5707,7 +5708,7 @@ static void search_filter_toolbar_on_raw_toggled (SearchFilterToolbar* self) {
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5711 "SearchFilter.c"
+#line 5712 "SearchFilter.c"
 }
 
 
@@ -5716,14 +5717,14 @@ static void search_filter_toolbar_on_search_text_changed (SearchFilterToolbar* s
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5720 "SearchFilter.c"
+#line 5721 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new40 (gboolean value) {
 #line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5727 "SearchFilter.c"
+#line 5728 "SearchFilter.c"
 }
 
 
@@ -5750,7 +5751,7 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self)
 		_g_object_unref0 (aw);
 #line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return;
-#line 5754 "SearchFilter.c"
+#line 5755 "SearchFilter.c"
 	}
 #line 1244 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = aw;
@@ -5764,7 +5765,7 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self)
 	_tmp5_ = action;
 #line 1248 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp5_ != NULL) {
-#line 5768 "SearchFilter.c"
+#line 5769 "SearchFilter.c"
 		GSimpleAction* _tmp6_ = NULL;
 		GVariant* _tmp7_ = NULL;
 #line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -5775,7 +5776,7 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self)
 		g_signal_emit_by_name (_tmp6_, "change-state", _tmp7_);
 #line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_variant_unref0 (_tmp7_);
-#line 5779 "SearchFilter.c"
+#line 5780 "SearchFilter.c"
 	}
 #line 1252 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
@@ -5783,7 +5784,7 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self)
 	_g_object_unref0 (action);
 #line 1238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (aw);
-#line 5787 "SearchFilter.c"
+#line 5788 "SearchFilter.c"
 }
 
 
@@ -5792,14 +5793,14 @@ static void search_filter_toolbar_on_criteria_changed (SearchFilterToolbar* self
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5796 "SearchFilter.c"
+#line 5797 "SearchFilter.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
 #line 1266 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 5803 "SearchFilter.c"
+#line 5804 "SearchFilter.c"
 }
 
 
@@ -5826,7 +5827,7 @@ void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchVie
 	if (_tmp0_ == _tmp1_) {
 #line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return;
-#line 5830 "SearchFilter.c"
+#line 5831 "SearchFilter.c"
 	}
 #line 1266 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = search_filter;
@@ -5854,7 +5855,7 @@ void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchVie
 	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"
 	search_filter_toolbar_update (self);
-#line 5858 "SearchFilter.c"
+#line 5859 "SearchFilter.c"
 }
 
 
@@ -5871,7 +5872,7 @@ void search_filter_toolbar_unset_view_filter (SearchFilterToolbar* self) {
 	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"
 	_view_filter_unref0 (_tmp1_);
-#line 5875 "SearchFilter.c"
+#line 5876 "SearchFilter.c"
 }
 
 
@@ -5964,7 +5965,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	_tmp0_ = self->priv->search_filter;
 #line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (NULL == _tmp0_) {
-#line 5968 "SearchFilter.c"
+#line 5969 "SearchFilter.c"
 		LibraryWindow* _tmp1_ = NULL;
 		LibraryWindow* _tmp2_ = NULL;
 #line 1283 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -5975,7 +5976,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 		library_window_show_search_bar (_tmp2_, TRUE);
 #line 1283 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp2_);
-#line 5979 "SearchFilter.c"
+#line 5980 "SearchFilter.c"
 	}
 #line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = self->priv->search_filter;
@@ -6167,7 +6168,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	_tmp73_ = _tmp72_;
 #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp73_) {
-#line 6171 "SearchFilter.c"
+#line 6172 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp74_ = NULL;
 		gboolean _tmp75_ = FALSE;
 		gboolean _tmp76_ = FALSE;
@@ -6179,11 +6180,11 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 		_tmp76_ = _tmp75_;
 #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp70_ = _tmp76_;
-#line 6183 "SearchFilter.c"
+#line 6184 "SearchFilter.c"
 	} else {
 #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp70_ = FALSE;
-#line 6187 "SearchFilter.c"
+#line 6188 "SearchFilter.c"
 	}
 #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp77_ = self->priv->sepr_mediatype_flagged;
@@ -6197,7 +6198,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	_tmp82_ = _tmp81_;
 #line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp82_) {
-#line 6201 "SearchFilter.c"
+#line 6202 "SearchFilter.c"
 		SearchFilterToolbarRatingFilterButton* _tmp83_ = NULL;
 		gboolean _tmp84_ = FALSE;
 		gboolean _tmp85_ = FALSE;
@@ -6209,17 +6210,17 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 		_tmp85_ = _tmp84_;
 #line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp79_ = _tmp85_;
-#line 6213 "SearchFilter.c"
+#line 6214 "SearchFilter.c"
 	} else {
 #line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp79_ = FALSE;
-#line 6217 "SearchFilter.c"
+#line 6218 "SearchFilter.c"
 	}
 #line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp79_) {
 #line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp78_ = TRUE;
-#line 6223 "SearchFilter.c"
+#line 6224 "SearchFilter.c"
 	} else {
 		gboolean _tmp86_ = FALSE;
 		SearchFilterToolbarToggleActionToolButton* _tmp87_ = NULL;
@@ -6233,7 +6234,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 		_tmp89_ = _tmp88_;
 #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp89_) {
-#line 6237 "SearchFilter.c"
+#line 6238 "SearchFilter.c"
 			SearchFilterToolbarRatingFilterButton* _tmp90_ = NULL;
 			gboolean _tmp91_ = FALSE;
 			gboolean _tmp92_ = FALSE;
@@ -6245,15 +6246,15 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 			_tmp92_ = _tmp91_;
 #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp86_ = _tmp92_;
-#line 6249 "SearchFilter.c"
+#line 6250 "SearchFilter.c"
 		} else {
 #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp86_ = FALSE;
-#line 6253 "SearchFilter.c"
+#line 6254 "SearchFilter.c"
 		}
 #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp78_ = _tmp86_;
-#line 6257 "SearchFilter.c"
+#line 6258 "SearchFilter.c"
 	}
 #line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp93_ = self->priv->sepr_flagged_rating;
@@ -6263,7 +6264,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	_tmp94_ = self->priv->search_filter;
 #line 1327 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 6267 "SearchFilter.c"
+#line 6268 "SearchFilter.c"
 }
 
 
@@ -6284,7 +6285,7 @@ static void search_filter_toolbar_on_savedsearch_selected (SearchFilterToolbar*
 	self->priv->saved_search = _tmp1_;
 #line 1332 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 6288 "SearchFilter.c"
+#line 6289 "SearchFilter.c"
 }
 
 
@@ -6297,7 +6298,7 @@ static void search_filter_toolbar_disable_savedsearch (SearchFilterToolbar* self
 	self->priv->saved_search = NULL;
 #line 1337 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 6301 "SearchFilter.c"
+#line 6302 "SearchFilter.c"
 }
 
 
@@ -6327,7 +6328,7 @@ static void search_filter_toolbar_edit_dialog (SearchFilterToolbar* self, SavedS
 	saved_search_dialog_show (ssd);
 #line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_saved_search_dialog_unref0 (ssd);
-#line 6331 "SearchFilter.c"
+#line 6332 "SearchFilter.c"
 }
 
 
@@ -6352,7 +6353,7 @@ static void search_filter_toolbar_delete_dialog (SearchFilterToolbar* self, Save
 	_tmp3_ = dialogs_confirm_delete_saved_search (_tmp2_);
 #line 1348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp3_) {
-#line 6356 "SearchFilter.c"
+#line 6357 "SearchFilter.c"
 		CommandManager* _tmp4_ = NULL;
 		CommandManager* _tmp5_ = NULL;
 		SavedSearch* _tmp6_ = NULL;
@@ -6374,7 +6375,7 @@ static void search_filter_toolbar_delete_dialog (SearchFilterToolbar* self, Save
 		_g_object_unref0 (_tmp8_);
 #line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_command_manager_unref0 (_tmp5_);
-#line 6378 "SearchFilter.c"
+#line 6379 "SearchFilter.c"
 	}
 }
 
@@ -6400,7 +6401,7 @@ static void search_filter_toolbar_add_dialog (SearchFilterToolbar* self) {
 	saved_search_dialog_show (_tmp3_);
 #line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_saved_search_dialog_unref0 (_tmp3_);
-#line 6404 "SearchFilter.c"
+#line 6405 "SearchFilter.c"
 }
 
 
@@ -6425,42 +6426,42 @@ static void search_filter_toolbar_on_popover_closed (SearchFilterToolbar* self)
 	_tmp3_ = _tmp2_->filter_popup;
 #line 1361 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_hide (_tmp3_);
-#line 6429 "SearchFilter.c"
+#line 6430 "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"
 	search_filter_toolbar_edit_dialog ((SearchFilterToolbar*) self, search);
-#line 6436 "SearchFilter.c"
+#line 6437 "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"
 	search_filter_toolbar_on_savedsearch_selected ((SearchFilterToolbar*) self, search);
-#line 6443 "SearchFilter.c"
+#line 6444 "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"
 	search_filter_toolbar_delete_dialog ((SearchFilterToolbar*) self, search);
-#line 6450 "SearchFilter.c"
+#line 6451 "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"
 	search_filter_toolbar_add_dialog ((SearchFilterToolbar*) self);
-#line 6457 "SearchFilter.c"
+#line 6458 "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"
 	search_filter_toolbar_on_popover_closed ((SearchFilterToolbar*) self);
-#line 6464 "SearchFilter.c"
+#line 6465 "SearchFilter.c"
 }
 
 
@@ -6473,28 +6474,28 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 	_tmp1_ = self->priv->elide_showing_again;
 #line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_) {
-#line 6477 "SearchFilter.c"
+#line 6478 "SearchFilter.c"
 		SavedSearch* _tmp2_ = NULL;
 #line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = self->priv->saved_search;
 #line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 6483 "SearchFilter.c"
+#line 6484 "SearchFilter.c"
 	} else {
 #line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = FALSE;
-#line 6487 "SearchFilter.c"
+#line 6488 "SearchFilter.c"
 	}
 #line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_) {
-#line 6491 "SearchFilter.c"
+#line 6492 "SearchFilter.c"
 	} else {
 		SavedSearch* _tmp3_ = NULL;
 #line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = self->priv->saved_search;
 #line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp3_ != NULL) {
-#line 6498 "SearchFilter.c"
+#line 6499 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchFilterButton* _tmp4_ = NULL;
 #line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (self->priv->saved_search);
@@ -6506,7 +6507,7 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 			search_filter_toolbar_saved_search_filter_button_set_active (_tmp4_, FALSE);
 #line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search_filter_toolbar_disable_savedsearch (self);
-#line 6510 "SearchFilter.c"
+#line 6511 "SearchFilter.c"
 		} else {
 			SearchFilterToolbarSavedSearchFilterButton* _tmp5_ = NULL;
 			SearchFilterToolbarSavedSearchPopover* _tmp6_ = NULL;
@@ -6531,7 +6532,7 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 			_tmp6_ = _tmp5_->filter_popup;
 #line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (_tmp6_ != NULL) {
-#line 6535 "SearchFilter.c"
+#line 6536 "SearchFilter.c"
 				SearchFilterToolbarSavedSearchFilterButton* _tmp7_ = NULL;
 				SearchFilterToolbarSavedSearchPopover* _tmp8_ = NULL;
 				guint _tmp9_ = 0U;
@@ -6587,7 +6588,7 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 				g_signal_parse_name ("closed", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp21_, NULL, FALSE);
 #line 1376 "/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 6591 "SearchFilter.c"
+#line 6592 "SearchFilter.c"
 			}
 #line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp22_ = self->priv->saved_search_button;
@@ -6635,12 +6636,12 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 			_tmp36_ = _tmp35_->filter_popup;
 #line 1385 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search_filter_toolbar_saved_search_popover_show_all (_tmp36_);
-#line 6639 "SearchFilter.c"
+#line 6640 "SearchFilter.c"
 		}
 	}
 #line 1387 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->elide_showing_again = FALSE;
-#line 6644 "SearchFilter.c"
+#line 6645 "SearchFilter.c"
 }
 
 
@@ -6652,7 +6653,7 @@ void search_filter_toolbar_take_focus (SearchFilterToolbar* self) {
 	_tmp0_ = self->priv->search_box;
 #line 1391 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_get_focus (_tmp0_);
-#line 6656 "SearchFilter.c"
+#line 6657 "SearchFilter.c"
 }
 
 
@@ -6683,18 +6684,18 @@ static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_c
 	if (_tmp3_ != 0) {
 #line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = TRUE;
-#line 6687 "SearchFilter.c"
+#line 6688 "SearchFilter.c"
 	} else {
 		gint _tmp4_ = 0;
 #line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = right_padding;
 #line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = _tmp4_ != 0;
-#line 6694 "SearchFilter.c"
+#line 6695 "SearchFilter.c"
 	}
 #line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp2_) {
-#line 6698 "SearchFilter.c"
+#line 6699 "SearchFilter.c"
 		GtkLabel* _tmp5_ = NULL;
 		GtkLabel* _tmp6_ = NULL;
 		GtkLabel* _tmp7_ = NULL;
@@ -6721,7 +6722,7 @@ static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_c
 		_tmp10_ = right_padding;
 #line 626 "/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 6725 "SearchFilter.c"
+#line 6726 "SearchFilter.c"
 	}
 #line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = self->priv->label;
@@ -6729,14 +6730,14 @@ static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_c
 	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"
 	return self;
-#line 6733 "SearchFilter.c"
+#line 6734 "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"
 	return search_filter_toolbar_label_tool_item_construct (SEARCH_FILTER_TOOLBAR_TYPE_LABEL_TOOL_ITEM, s, left_padding, right_padding);
-#line 6740 "SearchFilter.c"
+#line 6741 "SearchFilter.c"
 }
 
 
@@ -6747,14 +6748,14 @@ static void search_filter_toolbar_label_tool_item_class_init (SearchFilterToolba
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarLabelToolItemPrivate));
 #line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_label_tool_item_finalize;
-#line 6751 "SearchFilter.c"
+#line 6752 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_label_tool_item_instance_init (SearchFilterToolbarLabelToolItem * self) {
 #line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_LABEL_TOOL_ITEM_GET_PRIVATE (self);
-#line 6758 "SearchFilter.c"
+#line 6759 "SearchFilter.c"
 }
 
 
@@ -6766,7 +6767,7 @@ static void search_filter_toolbar_label_tool_item_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->label);
 #line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_label_tool_item_parent_class)->finalize (obj);
-#line 6770 "SearchFilter.c"
+#line 6771 "SearchFilter.c"
 }
 
 
@@ -6832,14 +6833,14 @@ static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_a
 	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"
 	return self;
-#line 6836 "SearchFilter.c"
+#line 6837 "SearchFilter.c"
 }
 
 
 static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_action_tool_button_new (const gchar* action) {
 #line 635 "/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 6843 "SearchFilter.c"
+#line 6844 "SearchFilter.c"
 }
 
 
@@ -6883,7 +6884,7 @@ static void search_filter_toolbar_toggle_action_tool_button_set_icon_name (Searc
 	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"
 	_g_object_unref0 (image);
-#line 6887 "SearchFilter.c"
+#line 6888 "SearchFilter.c"
 }
 
 
@@ -6900,7 +6901,7 @@ static void search_filter_toolbar_toggle_action_tool_button_set_label (SearchFil
 	_tmp1_ = label;
 #line 655 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_);
-#line 6904 "SearchFilter.c"
+#line 6905 "SearchFilter.c"
 }
 
 
@@ -6911,14 +6912,14 @@ static void search_filter_toolbar_toggle_action_tool_button_class_init (SearchFi
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarToggleActionToolButtonPrivate));
 #line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_toggle_action_tool_button_finalize;
-#line 6915 "SearchFilter.c"
+#line 6916 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_toggle_action_tool_button_instance_init (SearchFilterToolbarToggleActionToolButton * self) {
 #line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_TOGGLE_ACTION_TOOL_BUTTON_GET_PRIVATE (self);
-#line 6922 "SearchFilter.c"
+#line 6923 "SearchFilter.c"
 }
 
 
@@ -6930,7 +6931,7 @@ static void search_filter_toolbar_toggle_action_tool_button_finalize (GObject* o
 	_g_object_unref0 (self->priv->button);
 #line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_toggle_action_tool_button_parent_class)->finalize (obj);
-#line 6934 "SearchFilter.c"
+#line 6935 "SearchFilter.c"
 }
 
 
@@ -6949,42 +6950,42 @@ 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"
 	search_filter_toolbar_search_box_on_action_text_changed ((SearchFilterToolbarSearchBox*) self, text);
-#line 6953 "SearchFilter.c"
+#line 6954 "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"
 	search_filter_toolbar_search_box_on_sensitivity_changed ((SearchFilterToolbarSearchBox*) self, sensitive);
-#line 6960 "SearchFilter.c"
+#line 6961 "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"
 	search_filter_toolbar_search_box_on_visibility_changed ((SearchFilterToolbarSearchBox*) self, visible);
-#line 6967 "SearchFilter.c"
+#line 6968 "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"
 	search_filter_toolbar_search_box_on_entry_changed ((SearchFilterToolbarSearchBox*) self);
-#line 6974 "SearchFilter.c"
+#line 6975 "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"
 	search_filter_toolbar_search_box_on_entry_changed ((SearchFilterToolbarSearchBox*) self);
-#line 6981 "SearchFilter.c"
+#line 6982 "SearchFilter.c"
 }
 
 
 static gpointer _text_action_ref0 (gpointer self) {
 #line 672 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? text_action_ref (self) : NULL;
-#line 6988 "SearchFilter.c"
+#line 6989 "SearchFilter.c"
 }
 
 
@@ -6993,7 +6994,7 @@ static gboolean _search_filter_toolbar_search_box_on_escape_key_gtk_widget_key_p
 	result = search_filter_toolbar_search_box_on_escape_key ((SearchFilterToolbarSearchBox*) self, event);
 #line 676 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 6997 "SearchFilter.c"
+#line 6998 "SearchFilter.c"
 }
 
 
@@ -7087,14 +7088,14 @@ SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_construct (GType
 	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"
 	return self;
-#line 7091 "SearchFilter.c"
+#line 7092 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_new (TextAction* action) {
 #line 671 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_search_box_construct (SEARCH_FILTER_TOOLBAR_TYPE_SEARCH_BOX, action);
-#line 7098 "SearchFilter.c"
+#line 7099 "SearchFilter.c"
 }
 
 
@@ -7106,7 +7107,7 @@ void search_filter_toolbar_search_box_get_focus (SearchFilterToolbarSearchBox* s
 	_tmp0_ = self->priv->search_entry;
 #line 699 "/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 7110 "SearchFilter.c"
+#line 7111 "SearchFilter.c"
 }
 
 
@@ -7127,19 +7128,19 @@ static gboolean search_filter_toolbar_search_box_on_escape_key (SearchFilterTool
 	_tmp2_ = gdk_keyval_name (_tmp1_);
 #line 705 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (g_strcmp0 (_tmp2_, "Escape") == 0) {
-#line 7131 "SearchFilter.c"
+#line 7132 "SearchFilter.c"
 		TextAction* _tmp3_ = NULL;
 #line 706 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = self->priv->action;
 #line 706 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_clear (_tmp3_);
-#line 7137 "SearchFilter.c"
+#line 7138 "SearchFilter.c"
 	}
 #line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = FALSE;
 #line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 7143 "SearchFilter.c"
+#line 7144 "SearchFilter.c"
 }
 
 
@@ -7201,7 +7202,7 @@ static void search_filter_toolbar_search_box_on_action_text_changed (SearchFilte
 	_tmp14_ = _tmp13_;
 #line 718 "/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 7205 "SearchFilter.c"
+#line 7206 "SearchFilter.c"
 }
 
 
@@ -7232,7 +7233,7 @@ static void search_filter_toolbar_search_box_on_entry_changed (SearchFilterToolb
 	_tmp5_ = self->priv->action;
 #line 724 "/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 7236 "SearchFilter.c"
+#line 7237 "SearchFilter.c"
 }
 
 
@@ -7244,7 +7245,7 @@ static void search_filter_toolbar_search_box_on_sensitivity_changed (SearchFilte
 	_tmp0_ = sensitive;
 #line 728 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 7248 "SearchFilter.c"
+#line 7249 "SearchFilter.c"
 }
 
 
@@ -7256,7 +7257,7 @@ static void search_filter_toolbar_search_box_on_visibility_changed (SearchFilter
 	_tmp0_ = visible;
 #line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 7260 "SearchFilter.c"
+#line 7261 "SearchFilter.c"
 }
 
 
@@ -7270,23 +7271,23 @@ static void search_filter_toolbar_search_box_set_nullable_text (SearchFilterTool
 	_tmp1_ = text;
 #line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_ != NULL) {
-#line 7274 "SearchFilter.c"
+#line 7275 "SearchFilter.c"
 		const gchar* _tmp2_ = NULL;
 #line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = text;
 #line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = _tmp2_;
-#line 7280 "SearchFilter.c"
+#line 7281 "SearchFilter.c"
 	} else {
 #line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = "";
-#line 7284 "SearchFilter.c"
+#line 7285 "SearchFilter.c"
 	}
 #line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = self->priv->search_entry;
 #line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_entry_set_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_entry_get_type (), GtkEntry), _tmp0_);
-#line 7290 "SearchFilter.c"
+#line 7291 "SearchFilter.c"
 }
 
 
@@ -7297,14 +7298,14 @@ static void search_filter_toolbar_search_box_class_init (SearchFilterToolbarSear
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarSearchBoxPrivate));
 #line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_search_box_finalize;
-#line 7301 "SearchFilter.c"
+#line 7302 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_search_box_instance_init (SearchFilterToolbarSearchBox * self) {
 #line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_SEARCH_BOX_GET_PRIVATE (self);
-#line 7308 "SearchFilter.c"
+#line 7309 "SearchFilter.c"
 }
 
 
@@ -7370,7 +7371,7 @@ static void search_filter_toolbar_search_box_finalize (GObject* obj) {
 	_text_action_unref0 (self->priv->action);
 #line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_search_box_parent_class)->finalize (obj);
-#line 7374 "SearchFilter.c"
+#line 7375 "SearchFilter.c"
 }
 
 
@@ -7446,14 +7447,14 @@ SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_butto
 	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"
 	return self;
-#line 7450 "SearchFilter.c"
+#line 7451 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_button_new (GMenuModel* model) {
 #line 744 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_rating_filter_button_construct (SEARCH_FILTER_TOOLBAR_TYPE_RATING_FILTER_BUTTON, model);
-#line 7457 "SearchFilter.c"
+#line 7458 "SearchFilter.c"
 }
 
 
@@ -7479,7 +7480,7 @@ static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (Se
 	switch (_tmp0_) {
 #line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 7483 "SearchFilter.c"
+#line 7484 "SearchFilter.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 763 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7490,11 +7491,11 @@ static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (Se
 			filename = _tmp1_;
 #line 764 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7494 "SearchFilter.c"
+#line 7495 "SearchFilter.c"
 		}
 #line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 7498 "SearchFilter.c"
+#line 7499 "SearchFilter.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 767 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7505,12 +7506,12 @@ static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (Se
 			filename = _tmp2_;
 #line 768 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7509 "SearchFilter.c"
+#line 7510 "SearchFilter.c"
 		}
 		default:
 #line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 7514 "SearchFilter.c"
+#line 7515 "SearchFilter.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7521,7 +7522,7 @@ static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (Se
 			filename = _tmp3_;
 #line 773 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7525 "SearchFilter.c"
+#line 7526 "SearchFilter.c"
 		}
 	}
 #line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7552,7 +7553,7 @@ static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (Se
 	_g_free0 (filename);
 #line 780 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 7556 "SearchFilter.c"
+#line 7557 "SearchFilter.c"
 }
 
 
@@ -7576,7 +7577,7 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 	switch (_tmp0_) {
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 7580 "SearchFilter.c"
+#line 7581 "SearchFilter.c"
 		{
 			gint _tmp1_ = 0;
 			gint _tmp2_ = 0;
@@ -7588,11 +7589,11 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 			result = _tmp1_ + _tmp2_;
 #line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7592 "SearchFilter.c"
+#line 7593 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 7596 "SearchFilter.c"
+#line 7597 "SearchFilter.c"
 		{
 			gint _tmp3_ = 0;
 			gint _tmp4_ = 0;
@@ -7604,11 +7605,11 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 			result = (_tmp3_ * 2) + _tmp4_;
 #line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7608 "SearchFilter.c"
+#line 7609 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 7612 "SearchFilter.c"
+#line 7613 "SearchFilter.c"
 		{
 			gint _tmp5_ = 0;
 			gint _tmp6_ = 0;
@@ -7620,11 +7621,11 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 			result = (_tmp5_ * 3) + _tmp6_;
 #line 794 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7624 "SearchFilter.c"
+#line 7625 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 7628 "SearchFilter.c"
+#line 7629 "SearchFilter.c"
 		{
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
@@ -7636,13 +7637,13 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 			result = (_tmp7_ * 4) + _tmp8_;
 #line 796 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7640 "SearchFilter.c"
+#line 7641 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_OR_HIGHER:
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_ONLY:
-#line 7646 "SearchFilter.c"
+#line 7647 "SearchFilter.c"
 		{
 			gint _tmp9_ = 0;
 #line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7651,37 +7652,37 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 			result = _tmp9_ * 5;
 #line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7655 "SearchFilter.c"
+#line 7656 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 7659 "SearchFilter.c"
+#line 7660 "SearchFilter.c"
 		{
 #line 801 "/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"
 			return result;
-#line 7665 "SearchFilter.c"
+#line 7666 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 7669 "SearchFilter.c"
+#line 7670 "SearchFilter.c"
 		{
 #line 803 "/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"
 			return result;
-#line 7675 "SearchFilter.c"
+#line 7676 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 7679 "SearchFilter.c"
+#line 7680 "SearchFilter.c"
 		{
 #line 805 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = icon_plus;
 #line 805 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7685 "SearchFilter.c"
+#line 7686 "SearchFilter.c"
 		}
 		default:
 		{
@@ -7689,7 +7690,7 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 			result = icon_base;
 #line 807 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7693 "SearchFilter.c"
+#line 7694 "SearchFilter.c"
 		}
 	}
 }
@@ -7715,7 +7716,7 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo
 	switch (_tmp1_) {
 #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 7719 "SearchFilter.c"
+#line 7720 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp2_ = NULL;
 			const gchar* _tmp3_ = NULL;
@@ -7727,11 +7728,11 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo
 			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"
 			break;
-#line 7731 "SearchFilter.c"
+#line 7732 "SearchFilter.c"
 		}
 #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 7735 "SearchFilter.c"
+#line 7736 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp4_ = NULL;
 			const gchar* _tmp5_ = NULL;
@@ -7743,11 +7744,11 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo
 			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 7747 "SearchFilter.c"
+#line 7748 "SearchFilter.c"
 		}
 #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 7751 "SearchFilter.c"
+#line 7752 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp6_ = NULL;
 			const gchar* _tmp7_ = NULL;
@@ -7759,11 +7760,11 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo
 			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 7763 "SearchFilter.c"
+#line 7764 "SearchFilter.c"
 		}
 #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 7767 "SearchFilter.c"
+#line 7768 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp8_ = NULL;
 			const gchar* _tmp9_ = NULL;
@@ -7775,13 +7776,13 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo
 			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_button_get_type (), GtkButton), _tmp9_);
 #line 825 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7779 "SearchFilter.c"
+#line 7780 "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 7785 "SearchFilter.c"
+#line 7786 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp10_ = NULL;
 			const gchar* _tmp11_ = NULL;
@@ -7793,7 +7794,7 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo
 			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_button_get_type (), GtkButton), _tmp11_);
 #line 829 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7797 "SearchFilter.c"
+#line 7798 "SearchFilter.c"
 		}
 		default:
 		{
@@ -7823,7 +7824,7 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo
 			_g_object_unref0 (_tmp17_);
 #line 833 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7827 "SearchFilter.c"
+#line 7828 "SearchFilter.c"
 		}
 	}
 #line 836 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7846,7 +7847,7 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo
 	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"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 7850 "SearchFilter.c"
+#line 7851 "SearchFilter.c"
 }
 
 
@@ -7864,7 +7865,7 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_button_size (S
 	result = _tmp1_ + (2 * SEARCH_FILTER_TOOLBAR_FILTER_BUTTON_MARGIN);
 #line 843 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 7868 "SearchFilter.c"
+#line 7869 "SearchFilter.c"
 }
 
 
@@ -7881,7 +7882,7 @@ void search_filter_toolbar_rating_filter_button_set_label (SearchFilterToolbarRa
 	_tmp1_ = label;
 #line 847 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_);
-#line 7885 "SearchFilter.c"
+#line 7886 "SearchFilter.c"
 }
 
 
@@ -7890,7 +7891,7 @@ static void search_filter_toolbar_rating_filter_button_class_init (SearchFilterT
 	search_filter_toolbar_rating_filter_button_parent_class = g_type_class_peek_parent (klass);
 #line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_rating_filter_button_finalize;
-#line 7894 "SearchFilter.c"
+#line 7895 "SearchFilter.c"
 }
 
 
@@ -7906,7 +7907,7 @@ static void search_filter_toolbar_rating_filter_button_finalize (GObject* obj) {
 	_g_object_unref0 (self->button);
 #line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_rating_filter_button_parent_class)->finalize (obj);
-#line 7910 "SearchFilter.c"
+#line 7911 "SearchFilter.c"
 }
 
 
@@ -7925,7 +7926,7 @@ 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"
 	search_filter_toolbar_saved_search_filter_button_on_clicked ((SearchFilterToolbarSavedSearchFilterButton*) self);
-#line 7929 "SearchFilter.c"
+#line 7930 "SearchFilter.c"
 }
 
 
@@ -7985,14 +7986,14 @@ SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_f
 	_g_object_unref0 (image);
 #line 858 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 7989 "SearchFilter.c"
+#line 7990 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_filter_button_new (void) {
 #line 858 "/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 7996 "SearchFilter.c"
+#line 7997 "SearchFilter.c"
 }
 
 
@@ -8001,7 +8002,7 @@ static void search_filter_toolbar_saved_search_filter_button_on_clicked (SearchF
 	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 8005 "SearchFilter.c"
+#line 8006 "SearchFilter.c"
 }
 
 
@@ -8016,7 +8017,7 @@ void search_filter_toolbar_saved_search_filter_button_set_active (SearchFilterTo
 	_tmp1_ = active;
 #line 885 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_toggle_button_set_active (_tmp0_, _tmp1_);
-#line 8020 "SearchFilter.c"
+#line 8021 "SearchFilter.c"
 }
 
 
@@ -8033,7 +8034,7 @@ void search_filter_toolbar_saved_search_filter_button_set_label (SearchFilterToo
 	_tmp1_ = label;
 #line 889 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_);
-#line 8037 "SearchFilter.c"
+#line 8038 "SearchFilter.c"
 }
 
 
@@ -8050,7 +8051,7 @@ void search_filter_toolbar_saved_search_filter_button_restyle (SearchFilterToolb
 	_tmp1_ = self->button;
 #line 894 "/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 8054 "SearchFilter.c"
+#line 8055 "SearchFilter.c"
 }
 
 
@@ -8061,14 +8062,14 @@ static void search_filter_toolbar_saved_search_filter_button_class_init (SearchF
 	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 8065 "SearchFilter.c"
+#line 8066 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_filter_button_instance_init (SearchFilterToolbarSavedSearchFilterButton * self) {
 #line 853 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->filter_popup = NULL;
-#line 8072 "SearchFilter.c"
+#line 8073 "SearchFilter.c"
 }
 
 
@@ -8090,7 +8091,7 @@ static void search_filter_toolbar_saved_search_filter_button_finalize (GObject*
 	_g_object_unref0 (self->button);
 #line 852 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_saved_search_filter_button_parent_class)->finalize (obj);
-#line 8094 "SearchFilter.c"
+#line 8095 "SearchFilter.c"
 }
 
 
@@ -8109,35 +8110,35 @@ 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"
 	search_filter_toolbar_saved_search_popover_on_edit_click ((SearchFilterToolbarSavedSearchPopover*) self, search);
-#line 8113 "SearchFilter.c"
+#line 8114 "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"
 	search_filter_toolbar_saved_search_popover_on_delete_click ((SearchFilterToolbarSavedSearchPopover*) self, search);
-#line 8120 "SearchFilter.c"
+#line 8121 "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"
 	search_filter_toolbar_saved_search_popover_on_add_click ((SearchFilterToolbarSavedSearchPopover*) self);
-#line 8127 "SearchFilter.c"
+#line 8128 "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"
 	search_filter_toolbar_saved_search_popover_on_activate_row ((SearchFilterToolbarSavedSearchPopover*) self, row);
-#line 8134 "SearchFilter.c"
+#line 8135 "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"
 	search_filter_toolbar_saved_search_popover_on_popover_closed ((SearchFilterToolbarSavedSearchPopover*) self);
-#line 8141 "SearchFilter.c"
+#line 8142 "SearchFilter.c"
 }
 
 
@@ -8148,13 +8149,13 @@ static void _vala_array_add133 (SearchFilterToolbarSavedSearchPopoverDataButton*
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*array = g_renew (SearchFilterToolbarSavedSearchPopoverDataButton*, *array, (*size) + 1);
-#line 8152 "SearchFilter.c"
+#line 8153 "SearchFilter.c"
 	}
 #line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	(*array)[(*length)++] = value;
 #line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	(*array)[*length] = NULL;
-#line 8158 "SearchFilter.c"
+#line 8159 "SearchFilter.c"
 }
 
 
@@ -8165,13 +8166,13 @@ static void _vala_array_add134 (SearchFilterToolbarSavedSearchPopoverDataButton*
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*array = g_renew (SearchFilterToolbarSavedSearchPopoverDataButton*, *array, (*size) + 1);
-#line 8169 "SearchFilter.c"
+#line 8170 "SearchFilter.c"
 	}
 #line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	(*array)[(*length)++] = value;
 #line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	(*array)[*length] = NULL;
-#line 8175 "SearchFilter.c"
+#line 8176 "SearchFilter.c"
 }
 
 
@@ -8237,7 +8238,7 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 	self->priv->delete_buttons_length1 = 0;
 #line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_delete_buttons_size_ = self->priv->delete_buttons_length1;
-#line 8241 "SearchFilter.c"
+#line 8242 "SearchFilter.c"
 	{
 		GeeIterator* _search_it = NULL;
 		SavedSearchTable* _tmp6_ = NULL;
@@ -8266,7 +8267,7 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 		_search_it = _tmp11_;
 #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		while (TRUE) {
-#line 8270 "SearchFilter.c"
+#line 8271 "SearchFilter.c"
 			GeeIterator* _tmp12_ = NULL;
 			gboolean _tmp13_ = FALSE;
 			SavedSearch* search = NULL;
@@ -8314,7 +8315,7 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 			if (!_tmp13_) {
 #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				break;
-#line 8318 "SearchFilter.c"
+#line 8319 "SearchFilter.c"
 			}
 #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp14_ = _search_it;
@@ -8430,11 +8431,11 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 			_g_object_unref0 (row);
 #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (search);
-#line 8434 "SearchFilter.c"
+#line 8435 "SearchFilter.c"
 		}
 #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_search_it);
-#line 8438 "SearchFilter.c"
+#line 8439 "SearchFilter.c"
 	}
 #line 968 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp44_ = (GtkButton*) gtk_button_new_from_icon_name ("list-add-symbolic", GTK_ICON_SIZE_BUTTON);
@@ -8472,14 +8473,14 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 	search_filter_toolbar_saved_search_popover_restyle (self);
 #line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 8476 "SearchFilter.c"
+#line 8477 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popover_new (GtkWidget* relative_to) {
 #line 942 "/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 8483 "SearchFilter.c"
+#line 8484 "SearchFilter.c"
 }
 
 
@@ -8499,7 +8500,7 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave
 	_tmp1_ = self->priv->edit_buttons;
 #line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1__length1 = self->priv->edit_buttons_length1;
-#line 8503 "SearchFilter.c"
+#line 8504 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
@@ -8511,14 +8512,14 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave
 		button_collection_length1 = _tmp1__length1;
 #line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		for (button_it = 0; button_it < _tmp1__length1; button_it = button_it + 1) {
-#line 8515 "SearchFilter.c"
+#line 8516 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp2_ = NULL;
 			SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL;
 #line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp2_ = _g_object_ref0 (button_collection[button_it]);
 #line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			button = _tmp2_;
-#line 8522 "SearchFilter.c"
+#line 8523 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp3_ = NULL;
 #line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -8527,7 +8528,7 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave
 				search_filter_toolbar_saved_search_popover_data_button_restyle (_tmp3_);
 #line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (button);
-#line 8531 "SearchFilter.c"
+#line 8532 "SearchFilter.c"
 			}
 		}
 	}
@@ -8535,7 +8536,7 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave
 	_tmp4_ = self->priv->delete_buttons;
 #line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4__length1 = self->priv->delete_buttons_length1;
-#line 8539 "SearchFilter.c"
+#line 8540 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
@@ -8547,14 +8548,14 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave
 		button_collection_length1 = _tmp4__length1;
 #line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		for (button_it = 0; button_it < _tmp4__length1; button_it = button_it + 1) {
-#line 8551 "SearchFilter.c"
+#line 8552 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp5_ = NULL;
 			SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL;
 #line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp5_ = _g_object_ref0 (button_collection[button_it]);
 #line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			button = _tmp5_;
-#line 8558 "SearchFilter.c"
+#line 8559 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp6_ = NULL;
 #line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -8563,7 +8564,7 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave
 				search_filter_toolbar_saved_search_popover_data_button_restyle (_tmp6_);
 #line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (button);
-#line 8567 "SearchFilter.c"
+#line 8568 "SearchFilter.c"
 			}
 		}
 	}
@@ -8591,7 +8592,7 @@ static gboolean search_filter_toolbar_saved_search_popover_is_search_row (Search
 		result = FALSE;
 #line 993 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return result;
-#line 8595 "SearchFilter.c"
+#line 8596 "SearchFilter.c"
 	}
 #line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = row;
@@ -8613,13 +8614,13 @@ static gboolean search_filter_toolbar_saved_search_popover_is_search_row (Search
 		result = FALSE;
 #line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return result;
-#line 8617 "SearchFilter.c"
+#line 8618 "SearchFilter.c"
 	}
 #line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = TRUE;
 #line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 8623 "SearchFilter.c"
+#line 8624 "SearchFilter.c"
 }
 
 
@@ -8690,7 +8691,7 @@ static SavedSearch* search_filter_toolbar_saved_search_popover_get_search (Searc
 	_g_object_unref0 (button);
 #line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 8694 "SearchFilter.c"
+#line 8695 "SearchFilter.c"
 }
 
 
@@ -8708,7 +8709,7 @@ static void search_filter_toolbar_saved_search_popover_on_activate_row (SearchFi
 	_tmp1_ = search_filter_toolbar_saved_search_popover_is_search_row (self, _tmp0_);
 #line 1004 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_) {
-#line 8712 "SearchFilter.c"
+#line 8713 "SearchFilter.c"
 		GtkListBoxRow* _tmp2_ = NULL;
 		SavedSearch* _tmp3_ = NULL;
 		SavedSearch* _tmp4_ = NULL;
@@ -8722,13 +8723,13 @@ static void search_filter_toolbar_saved_search_popover_on_activate_row (SearchFi
 		g_signal_emit_by_name (self, "search-activated", _tmp4_);
 #line 1005 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp4_);
-#line 8726 "SearchFilter.c"
+#line 8727 "SearchFilter.c"
 	}
 #line 1006 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = self->priv->popover;
 #line 1006 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 8732 "SearchFilter.c"
+#line 8733 "SearchFilter.c"
 }
 
 
@@ -8742,7 +8743,7 @@ static void search_filter_toolbar_saved_search_popover_on_edit_click (SearchFilt
 	_tmp0_ = search;
 #line 1010 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "edit-clicked", _tmp0_);
-#line 8746 "SearchFilter.c"
+#line 8747 "SearchFilter.c"
 }
 
 
@@ -8756,7 +8757,7 @@ static void search_filter_toolbar_saved_search_popover_on_delete_click (SearchFi
 	_tmp0_ = search;
 #line 1014 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "delete-clicked", _tmp0_);
-#line 8760 "SearchFilter.c"
+#line 8761 "SearchFilter.c"
 }
 
 
@@ -8765,7 +8766,7 @@ static void search_filter_toolbar_saved_search_popover_on_add_click (SearchFilte
 	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 8769 "SearchFilter.c"
+#line 8770 "SearchFilter.c"
 }
 
 
@@ -8774,7 +8775,7 @@ static void search_filter_toolbar_saved_search_popover_on_popover_closed (Search
 	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 8778 "SearchFilter.c"
+#line 8779 "SearchFilter.c"
 }
 
 
@@ -8786,7 +8787,7 @@ void search_filter_toolbar_saved_search_popover_show_all (SearchFilterToolbarSav
 	_tmp0_ = self->priv->popover;
 #line 1026 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 8790 "SearchFilter.c"
+#line 8791 "SearchFilter.c"
 }
 
 
@@ -8798,14 +8799,14 @@ void search_filter_toolbar_saved_search_popover_hide (SearchFilterToolbarSavedSe
 	_tmp0_ = self->priv->popover;
 #line 1030 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 8802 "SearchFilter.c"
+#line 8803 "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"
 	search_filter_toolbar_saved_search_popover_data_button_on_click ((SearchFilterToolbarSavedSearchPopoverDataButton*) self);
-#line 8809 "SearchFilter.c"
+#line 8810 "SearchFilter.c"
 }
 
 
@@ -8848,14 +8849,14 @@ static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_sa
 	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"
 	return self;
-#line 8852 "SearchFilter.c"
+#line 8853 "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"
 	return search_filter_toolbar_saved_search_popover_data_button_construct (SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, search, name);
-#line 8859 "SearchFilter.c"
+#line 8860 "SearchFilter.c"
 }
 
 
@@ -8872,7 +8873,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_restyle (Sear
 	_tmp1_ = self->priv->button;
 #line 934 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_relief (_tmp1_, GTK_RELIEF_NONE);
-#line 8876 "SearchFilter.c"
+#line 8877 "SearchFilter.c"
 }
 
 
@@ -8884,7 +8885,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_on_click (Sea
 	_tmp0_ = self->priv->_search;
 #line 938 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "clicked", _tmp0_);
-#line 8888 "SearchFilter.c"
+#line 8889 "SearchFilter.c"
 }
 
 
@@ -8899,7 +8900,7 @@ static SavedSearch* search_filter_toolbar_saved_search_popover_data_button_get_s
 	result = _tmp0_;
 #line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 8903 "SearchFilter.c"
+#line 8904 "SearchFilter.c"
 }
 
 
@@ -8918,7 +8919,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_set_search (S
 	self->priv->_search = _tmp1_;
 #line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_notify ((GObject *) self, "search");
-#line 8922 "SearchFilter.c"
+#line 8923 "SearchFilter.c"
 }
 
 
@@ -8937,7 +8938,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_class_init (S
 	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 8941 "SearchFilter.c"
+#line 8942 "SearchFilter.c"
 }
 
 
@@ -8946,7 +8947,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_instance_init
 	self->priv = SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_GET_PRIVATE (self);
 #line 913 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->button = NULL;
-#line 8950 "SearchFilter.c"
+#line 8951 "SearchFilter.c"
 }
 
 
@@ -8968,7 +8969,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_finalize (GOb
 	_g_object_unref0 (self->priv->_search);
 #line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_saved_search_popover_data_button_parent_class)->finalize (obj);
-#line 8972 "SearchFilter.c"
+#line 8973 "SearchFilter.c"
 }
 
 
@@ -8995,13 +8996,13 @@ static void _vala_search_filter_toolbar_saved_search_popover_data_button_get_pro
 		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"
 		break;
-#line 8999 "SearchFilter.c"
+#line 9000 "SearchFilter.c"
 		default:
 #line 912 "/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"
 		break;
-#line 9005 "SearchFilter.c"
+#line 9006 "SearchFilter.c"
 	}
 }
 
@@ -9017,13 +9018,13 @@ static void _vala_search_filter_toolbar_saved_search_popover_data_button_set_pro
 		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"
 		break;
-#line 9021 "SearchFilter.c"
+#line 9022 "SearchFilter.c"
 		default:
 #line 912 "/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"
 		break;
-#line 9027 "SearchFilter.c"
+#line 9028 "SearchFilter.c"
 	}
 }
 
@@ -9031,7 +9032,7 @@ static void _vala_search_filter_toolbar_saved_search_popover_data_button_set_pro
 static void search_filter_toolbar_value_saved_search_popover_init (GValue* value) {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	value->data[0].v_pointer = NULL;
-#line 9035 "SearchFilter.c"
+#line 9036 "SearchFilter.c"
 }
 
 
@@ -9040,7 +9041,7 @@ static void search_filter_toolbar_value_saved_search_popover_free_value (GValue*
 	if (value->data[0].v_pointer) {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_unref (value->data[0].v_pointer);
-#line 9044 "SearchFilter.c"
+#line 9045 "SearchFilter.c"
 	}
 }
 
@@ -9050,11 +9051,11 @@ static void search_filter_toolbar_value_saved_search_popover_copy_value (const G
 	if (src_value->data[0].v_pointer) {
 #line 898 "/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 9054 "SearchFilter.c"
+#line 9055 "SearchFilter.c"
 	} else {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9058 "SearchFilter.c"
+#line 9059 "SearchFilter.c"
 	}
 }
 
@@ -9062,37 +9063,37 @@ static void search_filter_toolbar_value_saved_search_popover_copy_value (const G
 static gpointer search_filter_toolbar_value_saved_search_popover_peek_pointer (const GValue* value) {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 9066 "SearchFilter.c"
+#line 9067 "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"
 	if (collect_values[0].v_pointer) {
-#line 9073 "SearchFilter.c"
+#line 9074 "SearchFilter.c"
 		SearchFilterToolbarSavedSearchPopover* object;
 		object = collect_values[0].v_pointer;
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9080 "SearchFilter.c"
+#line 9081 "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"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9084 "SearchFilter.c"
+#line 9085 "SearchFilter.c"
 		}
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = search_filter_toolbar_saved_search_popover_ref (object);
-#line 9088 "SearchFilter.c"
+#line 9089 "SearchFilter.c"
 	} else {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 9092 "SearchFilter.c"
+#line 9093 "SearchFilter.c"
 	}
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 9096 "SearchFilter.c"
+#line 9097 "SearchFilter.c"
 }
 
 
@@ -9103,25 +9104,25 @@ static gchar* search_filter_toolbar_value_saved_search_popover_lcopy_value (cons
 	if (!object_p) {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9107 "SearchFilter.c"
+#line 9108 "SearchFilter.c"
 	}
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!value->data[0].v_pointer) {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = NULL;
-#line 9113 "SearchFilter.c"
+#line 9114 "SearchFilter.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9117 "SearchFilter.c"
+#line 9118 "SearchFilter.c"
 	} else {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = search_filter_toolbar_saved_search_popover_ref (value->data[0].v_pointer);
-#line 9121 "SearchFilter.c"
+#line 9122 "SearchFilter.c"
 	}
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 9125 "SearchFilter.c"
+#line 9126 "SearchFilter.c"
 }
 
 
@@ -9135,7 +9136,7 @@ GParamSpec* search_filter_toolbar_param_spec_saved_search_popover (const gchar*
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return G_PARAM_SPEC (spec);
-#line 9139 "SearchFilter.c"
+#line 9140 "SearchFilter.c"
 }
 
 
@@ -9144,7 +9145,7 @@ gpointer search_filter_toolbar_value_get_saved_search_popover (const GValue* val
 	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"
 	return value->data[0].v_pointer;
-#line 9148 "SearchFilter.c"
+#line 9149 "SearchFilter.c"
 }
 
 
@@ -9164,17 +9165,17 @@ void search_filter_toolbar_value_set_saved_search_popover (GValue* value, gpoint
 		value->data[0].v_pointer = v_object;
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_ref (value->data[0].v_pointer);
-#line 9168 "SearchFilter.c"
+#line 9169 "SearchFilter.c"
 	} else {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 9172 "SearchFilter.c"
+#line 9173 "SearchFilter.c"
 	}
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_unref (old);
-#line 9178 "SearchFilter.c"
+#line 9179 "SearchFilter.c"
 	}
 }
 
@@ -9193,17 +9194,17 @@ void search_filter_toolbar_value_take_saved_search_popover (GValue* value, gpoin
 		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"
 		value->data[0].v_pointer = v_object;
-#line 9197 "SearchFilter.c"
+#line 9198 "SearchFilter.c"
 	} else {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 9201 "SearchFilter.c"
+#line 9202 "SearchFilter.c"
 	}
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_unref (old);
-#line 9207 "SearchFilter.c"
+#line 9208 "SearchFilter.c"
 	}
 }
 
@@ -9225,7 +9226,7 @@ static void search_filter_toolbar_saved_search_popover_class_init (SearchFilterT
 	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 9229 "SearchFilter.c"
+#line 9230 "SearchFilter.c"
 }
 
 
@@ -9252,7 +9253,7 @@ static void search_filter_toolbar_saved_search_popover_instance_init (SearchFilt
 	self->priv->add = NULL;
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->ref_count = 1;
-#line 9256 "SearchFilter.c"
+#line 9257 "SearchFilter.c"
 }
 
 
@@ -9276,7 +9277,7 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo
 	_tmp0_ = self->priv->edit_buttons;
 #line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0__length1 = self->priv->edit_buttons_length1;
-#line 9280 "SearchFilter.c"
+#line 9281 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
@@ -9288,14 +9289,14 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo
 		button_collection_length1 = _tmp0__length1;
 #line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		for (button_it = 0; button_it < _tmp0__length1; button_it = button_it + 1) {
-#line 9292 "SearchFilter.c"
+#line 9293 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp1_ = NULL;
 			SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL;
 #line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp1_ = _g_object_ref0 (button_collection[button_it]);
 #line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			button = _tmp1_;
-#line 9299 "SearchFilter.c"
+#line 9300 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp2_ = NULL;
 				guint _tmp3_ = 0U;
@@ -9307,7 +9308,7 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo
 				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"
 				_g_object_unref0 (button);
-#line 9311 "SearchFilter.c"
+#line 9312 "SearchFilter.c"
 			}
 		}
 	}
@@ -9315,7 +9316,7 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo
 	_tmp4_ = self->priv->delete_buttons;
 #line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4__length1 = self->priv->delete_buttons_length1;
-#line 9319 "SearchFilter.c"
+#line 9320 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
@@ -9327,14 +9328,14 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo
 		button_collection_length1 = _tmp4__length1;
 #line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		for (button_it = 0; button_it < _tmp4__length1; button_it = button_it + 1) {
-#line 9331 "SearchFilter.c"
+#line 9332 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp5_ = NULL;
 			SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL;
 #line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp5_ = _g_object_ref0 (button_collection[button_it]);
 #line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			button = _tmp5_;
-#line 9338 "SearchFilter.c"
+#line 9339 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp6_ = NULL;
 				guint _tmp7_ = 0U;
@@ -9346,7 +9347,7 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo
 				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"
 				_g_object_unref0 (button);
-#line 9350 "SearchFilter.c"
+#line 9351 "SearchFilter.c"
 			}
 		}
 	}
@@ -9378,7 +9379,7 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo
 	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"
 	_g_object_unref0 (self->priv->add);
-#line 9382 "SearchFilter.c"
+#line 9383 "SearchFilter.c"
 }
 
 
@@ -9403,7 +9404,7 @@ gpointer search_filter_toolbar_saved_search_popover_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return instance;
-#line 9407 "SearchFilter.c"
+#line 9408 "SearchFilter.c"
 }
 
 
@@ -9416,7 +9417,7 @@ void search_filter_toolbar_saved_search_popover_unref (gpointer instance) {
 		SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_GET_CLASS (self)->finalize (self);
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9420 "SearchFilter.c"
+#line 9421 "SearchFilter.c"
 	}
 }
 
@@ -9428,7 +9429,7 @@ static void search_filter_toolbar_class_init (SearchFilterToolbarClass * klass)
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarPrivate));
 #line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_finalize;
-#line 9432 "SearchFilter.c"
+#line 9433 "SearchFilter.c"
 }
 
 
@@ -9467,7 +9468,7 @@ static void search_filter_toolbar_instance_init (SearchFilterToolbar * self) {
 	self->priv->elide_showing_again = FALSE;
 #line 1042 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->search_filter = NULL;
-#line 9471 "SearchFilter.c"
+#line 9472 "SearchFilter.c"
 }
 
 
@@ -9585,7 +9586,7 @@ static void search_filter_toolbar_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->sepr_rating_saved);
 #line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_parent_class)->finalize (obj);
-#line 9589 "SearchFilter.c"
+#line 9590 "SearchFilter.c"
 }
 
 
diff --git a/src/SlideshowPage.c b/src/SlideshowPage.c
index 84f1c80..c188275 100644
--- a/src/SlideshowPage.c
+++ b/src/SlideshowPage.c
@@ -1,4 +1,4 @@
-/* SlideshowPage.c generated by valac 0.34.4, the Vala compiler
+/* SlideshowPage.c generated by valac 0.34.7, the Vala compiler
  * generated from SlideshowPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -776,7 +776,7 @@ SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* so
 #line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	pluggables = _tmp8_;
 #line 147 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp9_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+	_tmp9_ = 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_;
 #line 148 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1066,24 +1066,24 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 #line 1067 "SlideshowPage.c"
 			DataSource* forward = NULL;
 			DataSource* back = NULL;
-			ViewCollection* _tmp40_ = NULL;
-			Photo* _tmp41_ = NULL;
-			DataSource* _tmp42_ = NULL;
+			ViewCollection* _tmp41_ = NULL;
+			Photo* _tmp42_ = NULL;
 			DataSource* _tmp43_ = NULL;
-			PixbufCache* _tmp44_ = NULL;
-			DataSource* _tmp45_ = NULL;
-			PixbufCache* _tmp46_ = NULL;
-			DataSource* _tmp47_ = NULL;
+			DataSource* _tmp44_ = NULL;
+			PixbufCache* _tmp45_ = NULL;
+			DataSource* _tmp46_ = NULL;
+			PixbufCache* _tmp47_ = NULL;
+			DataSource* _tmp48_ = NULL;
 			GeeSet* neighbors = NULL;
-			ViewCollection* _tmp48_ = NULL;
-			Photo* _tmp49_ = NULL;
-			GeeSet* _tmp50_ = NULL;
+			ViewCollection* _tmp49_ = NULL;
+			Photo* _tmp50_ = NULL;
 			GeeSet* _tmp51_ = NULL;
-			DataSource* _tmp52_ = NULL;
-			GeeSet* _tmp53_ = NULL;
-			DataSource* _tmp54_ = NULL;
-			PixbufCache* _tmp55_ = NULL;
-			GeeSet* _tmp56_ = NULL;
+			GeeSet* _tmp52_ = NULL;
+			DataSource* _tmp53_ = NULL;
+			GeeSet* _tmp54_ = NULL;
+			DataSource* _tmp55_ = NULL;
+			PixbufCache* _tmp56_ = NULL;
+			GeeSet* _tmp57_ = NULL;
 #line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			if (!_tmp2_) {
 #line 1090 "SlideshowPage.c"
@@ -1335,66 +1335,68 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 			__finally461:
 #line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1339 "SlideshowPage.c"
+				gboolean _tmp40_ = 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 FALSE;
-#line 1345 "SlideshowPage.c"
+				return _tmp40_;
+#line 1347 "SlideshowPage.c"
 			}
 #line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp40_ = self->priv->controller;
+			_tmp41_ = self->priv->controller;
 #line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp41_ = _vala_next;
+			_tmp42_ = _vala_next;
 #line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			view_collection_get_immediate_neighbors (_tmp40_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_DATA_SOURCE, DataSource), &_tmp42_, &_tmp43_, PHOTO_TYPENAME);
+			view_collection_get_immediate_neighbors (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_DATA_SOURCE, DataSource), &_tmp43_, &_tmp44_, 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 = _tmp42_;
+			forward = _tmp43_;
 #line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_object_unref0 (back);
 #line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			back = _tmp43_;
+			back = _tmp44_;
 #line 254 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp44_ = self->priv->cache;
+			_tmp45_ = self->priv->cache;
 #line 254 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp45_ = forward;
+			_tmp46_ = forward;
 #line 254 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			pixbuf_cache_prefetch (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_HIGHEST, FALSE);
+			pixbuf_cache_prefetch (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_HIGHEST, FALSE);
 #line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp46_ = self->priv->cache;
+			_tmp47_ = self->priv->cache;
 #line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp47_ = back;
+			_tmp48_ = back;
 #line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			pixbuf_cache_prefetch (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE);
+			pixbuf_cache_prefetch (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE);
 #line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp48_ = self->priv->controller;
+			_tmp49_ = self->priv->controller;
 #line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp49_ = _vala_next;
+			_tmp50_ = _vala_next;
 #line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp50_ = view_collection_get_extended_neighbors (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
+			_tmp51_ = view_collection_get_extended_neighbors (_tmp49_, G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
 #line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			neighbors = _tmp50_;
+			neighbors = _tmp51_;
 #line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp51_ = neighbors;
+			_tmp52_ = neighbors;
 #line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp52_ = forward;
+			_tmp53_ = forward;
 #line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection), _tmp52_);
+			gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), _tmp53_);
 #line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp53_ = neighbors;
+			_tmp54_ = neighbors;
 #line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp54_ = back;
+			_tmp55_ = back;
 #line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection), _tmp54_);
+			gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection), _tmp55_);
 #line 261 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp55_ = self->priv->cache;
+			_tmp56_ = self->priv->cache;
 #line 261 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp56_ = neighbors;
+			_tmp57_ = neighbors;
 #line 261 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			pixbuf_cache_prefetch_many (_tmp55_, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_COLLECTION, GeeCollection), BACKGROUND_JOB_JOB_PRIORITY_LOWEST, FALSE);
+			pixbuf_cache_prefetch_many (_tmp56_, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, 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"
@@ -1407,46 +1409,46 @@ 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 1411 "SlideshowPage.c"
+#line 1413 "SlideshowPage.c"
 			} else {
 #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_object_unref0 (_vala_next);
-#line 1415 "SlideshowPage.c"
+#line 1417 "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 1421 "SlideshowPage.c"
+#line 1423 "SlideshowPage.c"
 			} else {
 #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_object_unref0 (_vala_next_pixbuf);
-#line 1425 "SlideshowPage.c"
+#line 1427 "SlideshowPage.c"
 			}
 #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			return result;
-#line 1429 "SlideshowPage.c"
+#line 1431 "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 1436 "SlideshowPage.c"
+#line 1438 "SlideshowPage.c"
 	} else {
 #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (_vala_next);
-#line 1440 "SlideshowPage.c"
+#line 1442 "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 1446 "SlideshowPage.c"
+#line 1448 "SlideshowPage.c"
 	} else {
 #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (_vala_next_pixbuf);
-#line 1450 "SlideshowPage.c"
+#line 1452 "SlideshowPage.c"
 	}
 }
 
@@ -1461,7 +1463,7 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) {
 	_tmp0_ = self->priv->playing;
 #line 268 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp0_) {
-#line 1465 "SlideshowPage.c"
+#line 1467 "SlideshowPage.c"
 		GtkToolButton* _tmp1_ = NULL;
 		GtkToolButton* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
@@ -1483,7 +1485,7 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) {
 		_tmp5_ = _ ("Continue the slideshow");
 #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 1487 "SlideshowPage.c"
+#line 1489 "SlideshowPage.c"
 	} else {
 		GtkToolButton* _tmp6_ = NULL;
 		GtkToolButton* _tmp7_ = NULL;
@@ -1506,7 +1508,7 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) {
 		_tmp10_ = _ ("Pause the slideshow");
 #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 1510 "SlideshowPage.c"
+#line 1512 "SlideshowPage.c"
 	}
 #line 278 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp11_ = self->priv->playing;
@@ -1516,7 +1518,7 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) {
 	_tmp12_ = self->priv->timer;
 #line 281 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_timer_start (_tmp12_);
-#line 1520 "SlideshowPage.c"
+#line 1522 "SlideshowPage.c"
 }
 
 
@@ -1563,7 +1565,7 @@ 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 1567 "SlideshowPage.c"
+#line 1569 "SlideshowPage.c"
 		DataView* _tmp8_ = NULL;
 		DataView* _tmp9_ = NULL;
 		DataSource* _tmp10_ = NULL;
@@ -1580,7 +1582,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {
 		if (!(_tmp8_ != NULL)) {
 #line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			break;
-#line 1584 "SlideshowPage.c"
+#line 1586 "SlideshowPage.c"
 		}
 #line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = prev_view;
@@ -1594,7 +1596,7 @@ 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 1598 "SlideshowPage.c"
+#line 1600 "SlideshowPage.c"
 			DataView* _tmp13_ = NULL;
 			DataSource* _tmp14_ = NULL;
 #line 293 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1607,7 +1609,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 1611 "SlideshowPage.c"
+#line 1613 "SlideshowPage.c"
 		}
 #line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp15_ = self->priv->controller;
@@ -1638,7 +1640,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 1641 "SlideshowPage.c"
+#line 1643 "SlideshowPage.c"
 		}
 	}
 #line 305 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1653,7 +1655,7 @@ 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 1656 "SlideshowPage.c"
+#line 1658 "SlideshowPage.c"
 }
 
 
@@ -1705,7 +1707,7 @@ 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 1708 "SlideshowPage.c"
+#line 1710 "SlideshowPage.c"
 		DataView* _tmp8_ = NULL;
 		DataView* _tmp9_ = NULL;
 		DataSource* _tmp10_ = NULL;
@@ -1722,7 +1724,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
 		if (!(_tmp8_ != NULL)) {
 #line 315 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			break;
-#line 1725 "SlideshowPage.c"
+#line 1727 "SlideshowPage.c"
 		}
 #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = next_view;
@@ -1736,7 +1738,7 @@ 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 1739 "SlideshowPage.c"
+#line 1741 "SlideshowPage.c"
 			DataView* _tmp13_ = NULL;
 			DataSource* _tmp14_ = NULL;
 #line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1749,7 +1751,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 1752 "SlideshowPage.c"
+#line 1754 "SlideshowPage.c"
 		}
 #line 321 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp15_ = self->priv->controller;
@@ -1780,7 +1782,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 1782 "SlideshowPage.c"
+#line 1784 "SlideshowPage.c"
 		}
 	}
 #line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1801,7 +1803,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 1803 "SlideshowPage.c"
+#line 1805 "SlideshowPage.c"
 	}
 #line 334 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp25_ = next_photo;
@@ -1815,7 +1817,7 @@ 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 1817 "SlideshowPage.c"
+#line 1819 "SlideshowPage.c"
 }
 
 
@@ -1857,7 +1859,7 @@ 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 1859 "SlideshowPage.c"
+#line 1861 "SlideshowPage.c"
 		GdkPixbuf* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		Dimensions _tmp9_ = {0};
@@ -1872,7 +1874,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 1874 "SlideshowPage.c"
+#line 1876 "SlideshowPage.c"
 	}
 #line 346 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp11_ = self->priv->timer;
@@ -1880,7 +1882,7 @@ 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 1882 "SlideshowPage.c"
+#line 1884 "SlideshowPage.c"
 }
 
 
@@ -1904,7 +1906,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
 		result = FALSE;
 #line 351 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return result;
-#line 1906 "SlideshowPage.c"
+#line 1908 "SlideshowPage.c"
 	}
 #line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp1_ = self->priv->playing;
@@ -1914,7 +1916,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
 		result = TRUE;
 #line 354 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return result;
-#line 1916 "SlideshowPage.c"
+#line 1918 "SlideshowPage.c"
 	}
 #line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp2_ = self->priv->timer;
@@ -1936,7 +1938,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
 		result = TRUE;
 #line 357 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return result;
-#line 1938 "SlideshowPage.c"
+#line 1940 "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));
@@ -1944,7 +1946,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
 	result = TRUE;
 #line 361 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 1946 "SlideshowPage.c"
+#line 1948 "SlideshowPage.c"
 }
 
 
@@ -1959,7 +1961,7 @@ static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKe
 	GQuark _tmp5_ = 0U;
 #line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 1961 "SlideshowPage.c"
+#line 1963 "SlideshowPage.c"
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
 #line 364 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1982,27 +1984,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 1984 "SlideshowPage.c"
+#line 1986 "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 1991 "SlideshowPage.c"
+#line 1993 "SlideshowPage.c"
 			}
 		}
 	} else {
 #line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		switch (0) {
-#line 1997 "SlideshowPage.c"
+#line 1999 "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 2004 "SlideshowPage.c"
+#line 2006 "SlideshowPage.c"
 			}
 		}
 	}
@@ -2014,11 +2016,11 @@ 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 2016 "SlideshowPage.c"
+#line 2018 "SlideshowPage.c"
 	}
 #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (GTK_WIDGET_CLASS (slideshow_page_parent_class)->key_press_event != NULL) {
-#line 2020 "SlideshowPage.c"
+#line 2022 "SlideshowPage.c"
 		GdkEventKey* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2027,17 +2029,17 @@ static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKe
 		_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 2029 "SlideshowPage.c"
+#line 2031 "SlideshowPage.c"
 	} else {
 #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp7_ = TRUE;
-#line 2033 "SlideshowPage.c"
+#line 2035 "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 2039 "SlideshowPage.c"
+#line 2041 "SlideshowPage.c"
 }
 
 
@@ -2078,7 +2080,7 @@ static void slideshow_page_on_change_settings (SlideshowPage* self) {
 	_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 2080 "SlideshowPage.c"
+#line 2082 "SlideshowPage.c"
 		ConfigFacade* _tmp5_ = NULL;
 		ConfigFacade* _tmp6_ = NULL;
 		SlideshowPageSettingsDialog* _tmp7_ = NULL;
@@ -2150,7 +2152,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 2152 "SlideshowPage.c"
+#line 2154 "SlideshowPage.c"
 	}
 #line 401 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp22_ = settings_dialog;
@@ -2166,7 +2168,7 @@ 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 2168 "SlideshowPage.c"
+#line 2170 "SlideshowPage.c"
 }
 
 
@@ -2211,7 +2213,7 @@ 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 2213 "SlideshowPage.c"
+#line 2215 "SlideshowPage.c"
 }
 
 
@@ -2251,7 +2253,7 @@ 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 2253 "SlideshowPage.c"
+#line 2255 "SlideshowPage.c"
 		gint random = 0;
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
@@ -2283,7 +2285,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 2285 "SlideshowPage.c"
+#line 2287 "SlideshowPage.c"
 	}
 #line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp12_ = effect_id;
@@ -2293,7 +2295,7 @@ 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 2295 "SlideshowPage.c"
+#line 2297 "SlideshowPage.c"
 }
 
 
@@ -2366,14 +2368,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 2368 "SlideshowPage.c"
+#line 2370 "SlideshowPage.c"
 	} else {
 		const gchar* _tmp4_ = NULL;
 #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 2375 "SlideshowPage.c"
+#line 2377 "SlideshowPage.c"
 	}
 #line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp2_) {
@@ -2381,7 +2383,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 2383 "SlideshowPage.c"
+#line 2385 "SlideshowPage.c"
 	}
 #line 431 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp5_ = title;
@@ -2449,7 +2451,7 @@ 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 2451 "SlideshowPage.c"
+#line 2453 "SlideshowPage.c"
 		Dimensions _tmp28_ = {0};
 		gint _tmp29_ = 0;
 		gint _tmp30_ = 0;
@@ -2461,7 +2463,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 2463 "SlideshowPage.c"
+#line 2465 "SlideshowPage.c"
 	}
 #line 448 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp31_ = x;
@@ -2473,7 +2475,7 @@ 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 2475 "SlideshowPage.c"
+#line 2477 "SlideshowPage.c"
 		Dimensions _tmp35_ = {0};
 		gint _tmp36_ = 0;
 		gint _tmp37_ = 0;
@@ -2485,7 +2487,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 2487 "SlideshowPage.c"
+#line 2489 "SlideshowPage.c"
 	}
 #line 451 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp38_ = ctx;
@@ -2531,7 +2533,7 @@ 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 2533 "SlideshowPage.c"
+#line 2535 "SlideshowPage.c"
 }
 
 
@@ -2568,21 +2570,21 @@ 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 2570 "SlideshowPage.c"
+#line 2572 "SlideshowPage.c"
 		gboolean _tmp7_ = FALSE;
 #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 2576 "SlideshowPage.c"
+#line 2578 "SlideshowPage.c"
 	} else {
 #line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = FALSE;
-#line 2580 "SlideshowPage.c"
+#line 2582 "SlideshowPage.c"
 	}
 #line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp2_) {
-#line 2584 "SlideshowPage.c"
+#line 2586 "SlideshowPage.c"
 		cairo_t* _tmp8_ = NULL;
 		Dimensions _tmp9_ = {0};
 #line 464 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2591,7 +2593,7 @@ static void slideshow_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dime
 		_tmp9_ = *ctx_dim;
 #line 464 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		slideshow_page_paint_title (self, _tmp8_, &_tmp9_);
-#line 2593 "SlideshowPage.c"
+#line 2595 "SlideshowPage.c"
 	}
 }
 
@@ -2601,14 +2603,14 @@ 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 2603 "SlideshowPage.c"
+#line 2605 "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 2610 "SlideshowPage.c"
+#line 2612 "SlideshowPage.c"
 }
 
 
@@ -2843,7 +2845,7 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 72 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	i = 1;
-#line 2845 "SlideshowPage.c"
+#line 2847 "SlideshowPage.c"
 	{
 		GeeIterator* _display_name_it = NULL;
 		TransitionEffectsManager* _tmp43_ = NULL;
@@ -2872,7 +2874,7 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
 		_display_name_it = _tmp48_;
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		while (TRUE) {
-#line 2874 "SlideshowPage.c"
+#line 2876 "SlideshowPage.c"
 			GeeIterator* _tmp49_ = NULL;
 			gboolean _tmp50_ = FALSE;
 			gchar* display_name = NULL;
@@ -2898,7 +2900,7 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
 			if (!_tmp50_) {
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				break;
-#line 2900 "SlideshowPage.c"
+#line 2902 "SlideshowPage.c"
 			}
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp51_ = _display_name_it;
@@ -2916,7 +2918,7 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
 				_g_free0 (display_name);
 #line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				continue;
-#line 2918 "SlideshowPage.c"
+#line 2920 "SlideshowPage.c"
 			}
 #line 78 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp55_ = self->priv->transition_effect_selector;
@@ -2944,7 +2946,7 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
 			_transition_effects_manager_unref0 (_tmp59_);
 #line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			if (_tmp63_) {
-#line 2946 "SlideshowPage.c"
+#line 2948 "SlideshowPage.c"
 				GtkComboBoxText* _tmp64_ = NULL;
 				gint _tmp65_ = 0;
 #line 80 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2953,7 +2955,7 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
 				_tmp65_ = 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 2955 "SlideshowPage.c"
+#line 2957 "SlideshowPage.c"
 			}
 #line 82 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp66_ = i;
@@ -2961,11 +2963,11 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
 			i = _tmp66_ + 1;
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_free0 (display_name);
-#line 2963 "SlideshowPage.c"
+#line 2965 "SlideshowPage.c"
 		}
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (_display_name_it);
-#line 2967 "SlideshowPage.c"
+#line 2969 "SlideshowPage.c"
 	}
 #line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp67_ = self->priv->transition_effect_selector;
@@ -3073,14 +3075,14 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
 	_g_object_unref0 (adjustment);
 #line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return self;
-#line 3075 "SlideshowPage.c"
+#line 3077 "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 3082 "SlideshowPage.c"
+#line 3084 "SlideshowPage.c"
 }
 
 
@@ -3105,17 +3107,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 3107 "SlideshowPage.c"
+#line 3109 "SlideshowPage.c"
 		const gchar* _tmp4_ = NULL;
 #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 3113 "SlideshowPage.c"
+#line 3115 "SlideshowPage.c"
 	} else {
 #line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = FALSE;
-#line 3117 "SlideshowPage.c"
+#line 3119 "SlideshowPage.c"
 	}
 #line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	sensitive = _tmp2_;
@@ -3129,7 +3131,7 @@ 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 3131 "SlideshowPage.c"
+#line 3133 "SlideshowPage.c"
 }
 
 
@@ -3147,7 +3149,7 @@ static gdouble slideshow_page_settings_dialog_get_delay (SlideshowPageSettingsDi
 	result = _tmp1_;
 #line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 3149 "SlideshowPage.c"
+#line 3151 "SlideshowPage.c"
 }
 
 
@@ -3165,7 +3167,7 @@ static gdouble slideshow_page_settings_dialog_get_transition_delay (SlideshowPag
 	result = _tmp1_;
 #line 122 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 3167 "SlideshowPage.c"
+#line 3169 "SlideshowPage.c"
 }
 
 
@@ -3196,7 +3198,7 @@ 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 3198 "SlideshowPage.c"
+#line 3200 "SlideshowPage.c"
 		gchar* _tmp3_ = NULL;
 #line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp3_ = g_strdup (TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID);
@@ -3206,7 +3208,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 3208 "SlideshowPage.c"
+#line 3210 "SlideshowPage.c"
 	}
 #line 130 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp4_ = transition_effects_manager_get_instance ();
@@ -3226,17 +3228,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 3228 "SlideshowPage.c"
+#line 3230 "SlideshowPage.c"
 		const gchar* _tmp11_ = NULL;
 #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp11_ = id;
 #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = _tmp11_;
-#line 3234 "SlideshowPage.c"
+#line 3236 "SlideshowPage.c"
 	} else {
 #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID;
-#line 3238 "SlideshowPage.c"
+#line 3240 "SlideshowPage.c"
 	}
 #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp12_ = g_strdup (_tmp9_);
@@ -3248,7 +3250,7 @@ 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 3250 "SlideshowPage.c"
+#line 3252 "SlideshowPage.c"
 }
 
 
@@ -3269,7 +3271,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 3271 "SlideshowPage.c"
+#line 3273 "SlideshowPage.c"
 }
 
 
@@ -3280,7 +3282,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 3282 "SlideshowPage.c"
+#line 3284 "SlideshowPage.c"
 }
 
 
@@ -3289,7 +3291,7 @@ 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 3291 "SlideshowPage.c"
+#line 3293 "SlideshowPage.c"
 }
 
 
@@ -3317,7 +3319,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 3319 "SlideshowPage.c"
+#line 3321 "SlideshowPage.c"
 }
 
 
@@ -3339,22 +3341,22 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 3356 "SlideshowPage.c"
+#line 3358 "SlideshowPage.c"
 }
 
 
@@ -3372,7 +3374,7 @@ 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 3374 "SlideshowPage.c"
+#line 3376 "SlideshowPage.c"
 }
 
 
@@ -3400,7 +3402,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 3402 "SlideshowPage.c"
+#line 3404 "SlideshowPage.c"
 }
 
 
diff --git a/src/SortedList.c b/src/SortedList.c
index a858888..dbb0525 100644
--- a/src/SortedList.c
+++ b/src/SortedList.c
@@ -1,4 +1,4 @@
-/* SortedList.c generated by valac 0.34.4, the Vala compiler
+/* SortedList.c generated by valac 0.34.7, the Vala compiler
  * generated from SortedList.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -230,7 +230,7 @@ SortedList* sorted_list_construct (GType object_type, GType g_type, GBoxedCopyFu
 #line 29 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self->priv->g_destroy_func = g_destroy_func;
 #line 30 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp0_ = gee_array_list_new (g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (g_type, (GBoxedCopyFunc) g_dup_func, (GDestroyNotify) g_destroy_func, NULL, NULL, NULL);
 #line 30 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_g_object_unref0 (self->priv->list);
 #line 30 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -501,7 +501,7 @@ static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* co
 		GeeList* _tmp27_ = NULL;
 		gboolean _tmp28_ = FALSE;
 #line 83 "/home/jens/Source/shotwell/src/SortedList.vala"
-		_tmp24_ = gee_array_list_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, self->priv->g_destroy_func, NULL, NULL, NULL);
+		_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"
 		items = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_LIST, GeeList);
 #line 84 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -779,7 +779,7 @@ inline gint sorted_list_get_count (SortedList* self) {
 #line 154 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
 #line 154 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 154 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = _tmp1_;
 #line 154 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -833,7 +833,7 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G
 #line 165 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = self->priv->list;
 #line 165 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 165 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp3_ = _tmp2_;
 #line 165 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1074,7 +1074,7 @@ gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altere
 #line 202 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp3_ = self->priv->list;
 #line 202 "/home/jens/Source/shotwell/src/SortedList.vala"
-		_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 202 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp5_ = _tmp4_;
 #line 202 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1390,7 +1390,7 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i
 #line 275 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
 #line 275 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 275 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = _tmp1_;
 #line 275 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1475,7 +1475,7 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i
 #line 287 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp15_ = self->priv->list;
 #line 287 "/home/jens/Source/shotwell/src/SortedList.vala"
-				_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection));
+				_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 287 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp17_ = _tmp16_;
 #line 287 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1487,7 +1487,7 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i
 #line 288 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp18_ = self->priv->list;
 #line 288 "/home/jens/Source/shotwell/src/SortedList.vala"
-					_tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
+					_tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 288 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp20_ = _tmp19_;
 #line 288 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1579,7 +1579,7 @@ SortedList* sorted_list_copy (SortedList* self) {
 #line 304 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0__target = self->priv->cmp_target;
 #line 304 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp1_ = sorted_list_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, self->priv->g_destroy_func, _tmp0_, _tmp0__target);
+	_tmp1_ = sorted_list_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, (GDestroyNotify) self->priv->g_destroy_func, _tmp0_, _tmp0__target);
 #line 304 "/home/jens/Source/shotwell/src/SortedList.vala"
 	copy = _tmp1_;
 #line 306 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -1640,7 +1640,7 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) {
 #line 332 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = self->priv->list;
 #line 332 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 332 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp3_ = _tmp2_;
 #line 332 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -2495,7 +2495,7 @@ static gboolean sorted_list_real_get_read_only (GeeCollection* base) {
 #line 39 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
 #line 39 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp1_ = gee_abstract_collection_get_read_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp1_ = gee_abstract_collection_get_read_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 39 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = _tmp1_;
 #line 39 "/home/jens/Source/shotwell/src/SortedList.vala"
@@ -2539,7 +2539,7 @@ static gint sorted_list_real_get_size (GeeCollection* base) {
 #line 150 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
 #line 150 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 150 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = _tmp1_;
 #line 150 "/home/jens/Source/shotwell/src/SortedList.vala"
diff --git a/src/Tag.c b/src/Tag.c
index 9545f23..000dd2d 100644
--- a/src/Tag.c
+++ b/src/Tag.c
@@ -1,4 +1,4 @@
-/* Tag.c generated by valac 0.34.4, the Vala compiler
+/* Tag.c generated by valac 0.34.7, the Vala compiler
  * generated from Tag.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1552,7 +1552,7 @@ GeeCollection* tag_source_collection_get_all_names (TagSourceCollection* self) {
 #line 91 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp0_ = self->priv->name_map;
 #line 91 "/home/jens/Source/shotwell/src/Tag.vala"
-	_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+	_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 91 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp2_ = _tmp1_;
 #line 91 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2480,7 +2480,7 @@ static void tag_source_collection_real_notify_container_contents_added (Containe
 				MediaSource* _tmp16_ = NULL;
 				GeeList* _tmp17_ = NULL;
 #line 215 "/home/jens/Source/shotwell/src/Tag.vala"
-				_tmp14_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+				_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"
 				_g_object_unref0 (tags);
 #line 215 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2525,7 +2525,7 @@ static void tag_source_collection_real_notify_container_contents_added (Containe
 				MediaSource* _tmp28_ = NULL;
 				GeeSortedSet* _tmp29_ = NULL;
 #line 224 "/home/jens/Source/shotwell/src/Tag.vala"
-				_tmp26_ = gee_tree_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tag_compare_names_gcompare_data_func, NULL, NULL);
+				_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"
 				_g_object_unref0 (sorted_tags);
 #line 224 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -2802,21 +2802,21 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
 }
 
@@ -2828,15 +2828,15 @@ static void tag_source_collection_instance_init (TagSourceCollection * self) {
 #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"
-	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tag_hash_name_string_gee_hash_data_func, NULL, NULL, _tag_equal_name_strings_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tag_hash_name_string_gee_hash_data_func, NULL, NULL, _tag_equal_name_strings_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 8 "/home/jens/Source/shotwell/src/Tag.vala"
 	self->priv->name_map = _tmp0_;
 #line 10 "/home/jens/Source/shotwell/src/Tag.vala"
-	_tmp1_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp1_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 10 "/home/jens/Source/shotwell/src/Tag.vala"
 	self->priv->source_map = _tmp1_;
 #line 12 "/home/jens/Source/shotwell/src/Tag.vala"
-	_tmp2_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, GEE_TYPE_SORTED_SET, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp2_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GEE_TYPE_SORTED_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 12 "/home/jens/Source/shotwell/src/Tag.vala"
 	self->priv->sorted_source_map = _tmp2_;
 #line 2843 "Tag.c"
@@ -2960,11 +2960,11 @@ static Tag* tag_construct (GType object_type, TagRow* row, gint64 object_id) {
 #line 338 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp3_->name = _tmp6_;
 #line 341 "/home/jens/Source/shotwell/src/Tag.vala"
-	_tmp7_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp7_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 341 "/home/jens/Source/shotwell/src/Tag.vala"
 	source_list = _tmp7_;
 #line 342 "/home/jens/Source/shotwell/src/Tag.vala"
-	_tmp8_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp8_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 342 "/home/jens/Source/shotwell/src/Tag.vala"
 	thumbnail_views = _tmp8_;
 #line 343 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3084,7 +3084,7 @@ static Tag* tag_construct (GType object_type, TagRow* row, gint64 object_id) {
 #line 355 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp30_ = self->priv->row;
 #line 355 "/home/jens/Source/shotwell/src/Tag.vala"
-		_tmp31_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+		_tmp31_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 355 "/home/jens/Source/shotwell/src/Tag.vala"
 		_g_object_unref0 (_tmp30_->source_id_list);
 #line 355 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3128,7 +3128,7 @@ static Tag* tag_construct (GType object_type, TagRow* row, gint64 object_id) {
 #line 364 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp44_ = source_list;
 #line 364 "/home/jens/Source/shotwell/src/Tag.vala"
-	_tmp45_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp45_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 364 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp46_ = _tmp45_;
 #line 364 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3295,11 +3295,11 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 3296 "Tag.c"
 	}
 #line 404 "/home/jens/Source/shotwell/src/Tag.vala"
-	_tmp8_ = gee_tree_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp8_ = gee_tree_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 404 "/home/jens/Source/shotwell/src/Tag.vala"
 	ancestry_dictionary = _tmp8_;
 #line 406 "/home/jens/Source/shotwell/src/Tag.vala"
-	_tmp9_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp9_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 406 "/home/jens/Source/shotwell/src/Tag.vala"
 	unlinked = _tmp9_;
 #line 407 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3588,7 +3588,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 		}
 	}
 #line 440 "/home/jens/Source/shotwell/src/Tag.vala"
-	_tmp54_ = gee_hash_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp54_ = gee_hash_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 440 "/home/jens/Source/shotwell/src/Tag.vala"
 	victim_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_SET, GeeSet);
 #line 3595 "Tag.c"
@@ -3603,7 +3603,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 445 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp55_ = ancestry_dictionary;
 #line 445 "/home/jens/Source/shotwell/src/Tag.vala"
-		_tmp56_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GEE_TYPE_MAP, GeeMap));
+		_tmp56_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 445 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp57_ = _tmp56_;
 #line 445 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3873,7 +3873,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 470 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp111_ = ancestry_dictionary;
 #line 470 "/home/jens/Source/shotwell/src/Tag.vala"
-		_tmp112_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, GEE_TYPE_MAP, GeeMap));
+		_tmp112_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 470 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp113_ = _tmp112_;
 #line 470 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4185,7 +4185,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 516 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp172_ = ancestry_dictionary;
 #line 516 "/home/jens/Source/shotwell/src/Tag.vala"
-	_tmp173_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp172_, GEE_TYPE_MAP, GeeMap));
+	_tmp173_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp172_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 516 "/home/jens/Source/shotwell/src/Tag.vala"
 	_tmp174_ = _tmp173_;
 #line 516 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4216,7 +4216,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 521 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp180_ = ancestry_dictionary;
 #line 521 "/home/jens/Source/shotwell/src/Tag.vala"
-		_tmp181_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp180_, GEE_TYPE_MAP, GeeMap));
+		_tmp181_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp180_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 521 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp182_ = _tmp181_;
 #line 521 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4652,7 +4652,7 @@ GeeCollection* tag_get_terminal_tags (GeeCollection* tags) {
 #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"
-	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 574 "/home/jens/Source/shotwell/src/Tag.vala"
 	result_paths = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet);
 #line 4659 "Tag.c"
@@ -4832,7 +4832,7 @@ GeeCollection* tag_get_terminal_tags (GeeCollection* tags) {
 #line 4833 "Tag.c"
 	}
 #line 596 "/home/jens/Source/shotwell/src/Tag.vala"
-	_tmp38_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp38_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 596 "/home/jens/Source/shotwell/src/Tag.vala"
 	_result_ = _tmp38_;
 #line 4839 "Tag.c"
@@ -5013,7 +5013,7 @@ GeeList* tag_make_user_visible_tag_list (GeeCollection* tags) {
 #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"
-	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 613 "/home/jens/Source/shotwell/src/Tag.vala"
 	seen_tags = _tmp0_;
 #line 614 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5023,7 +5023,7 @@ GeeList* tag_make_user_visible_tag_list (GeeCollection* tags) {
 #line 614 "/home/jens/Source/shotwell/src/Tag.vala"
 	terminal_tags = _tmp2_;
 #line 615 "/home/jens/Source/shotwell/src/Tag.vala"
-	_tmp3_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp3_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 615 "/home/jens/Source/shotwell/src/Tag.vala"
 	sorted_tags = _tmp3_;
 #line 5030 "Tag.c"
@@ -6317,11 +6317,11 @@ GeeList* tag_get_hierarchical_children (Tag* self) {
 #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"
-	_tmp0_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 798 "/home/jens/Source/shotwell/src/Tag.vala"
 	_result_ = _tmp0_;
 #line 799 "/home/jens/Source/shotwell/src/Tag.vala"
-	_tmp1_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp1_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 799 "/home/jens/Source/shotwell/src/Tag.vala"
 	result_reversed = _tmp1_;
 #line 802 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6345,7 +6345,7 @@ GeeList* tag_get_hierarchical_children (Tag* self) {
 #line 6346 "Tag.c"
 	}
 #line 807 "/home/jens/Source/shotwell/src/Tag.vala"
-	_tmp6_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+	_tmp6_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 807 "/home/jens/Source/shotwell/src/Tag.vala"
 	forward_sorted_paths = _tmp6_;
 #line 809 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -6502,7 +6502,7 @@ GeeList* tag_get_hierarchical_children (Tag* self) {
 #line 819 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp35_ = result_reversed;
 #line 819 "/home/jens/Source/shotwell/src/Tag.vala"
-		_tmp36_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp36_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 819 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp37_ = _tmp36_;
 #line 819 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7421,7 +7421,7 @@ void tag_attach_many (Tag* self, GeeCollection* sources) {
 #line 7422 "Tag.c"
 		}
 #line 975 "/home/jens/Source/shotwell/src/Tag.vala"
-		_tmp2_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+		_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"
@@ -7503,7 +7503,7 @@ void tag_attach_many (Tag* self, GeeCollection* sources) {
 #line 981 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp17_ = view_list;
 #line 981 "/home/jens/Source/shotwell/src/Tag.vala"
-		_tmp18_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp18_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 981 "/home/jens/Source/shotwell/src/Tag.vala"
 		_tmp19_ = _tmp18_;
 #line 981 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7586,7 +7586,7 @@ GeeList* tag_detach (Tag* self, MediaSource* source) {
 #line 7587 "Tag.c"
 	}
 #line 996 "/home/jens/Source/shotwell/src/Tag.vala"
-	_tmp4_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
@@ -7757,7 +7757,7 @@ GeeMultiMap* tag_detach_many (Tag* self, GeeCollection* sources) {
 #line 1015 "/home/jens/Source/shotwell/src/Tag.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (sources), NULL);
 #line 1016 "/home/jens/Source/shotwell/src/Tag.vala"
-	_tmp0_ = gee_hash_multi_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_multi_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1016 "/home/jens/Source/shotwell/src/Tag.vala"
 	detached_from = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
 #line 1018 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -8735,7 +8735,7 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 #line 8736 "Tag.c"
 		GeeArrayList* _tmp1_ = NULL;
 #line 1122 "/home/jens/Source/shotwell/src/Tag.vala"
-		_tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+		_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"
@@ -8880,7 +8880,7 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 #line 8881 "Tag.c"
 		GeeArrayList* _tmp30_ = NULL;
 #line 1140 "/home/jens/Source/shotwell/src/Tag.vala"
-		_tmp30_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+		_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"
@@ -9199,7 +9199,7 @@ static void tag_real_destroy (DataSource* base) {
 #line 1180 "/home/jens/Source/shotwell/src/Tag.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _tag_on_media_views_contents_altered_data_collection_contents_altered, self);
 #line 1182 "/home/jens/Source/shotwell/src/Tag.vala"
-		_tmp4_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+		_tmp4_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1182 "/home/jens/Source/shotwell/src/Tag.vala"
 		removed = _tmp4_;
 #line 1183 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9487,7 +9487,7 @@ 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 = tag_tag_snapshot_real_notify_broken;
+	((SourceSnapshotClass *) klass)->notify_broken = (void (*)(SourceSnapshot*)) tag_tag_snapshot_real_notify_broken;
 #line 9492 "Tag.c"
 }
 
@@ -9497,7 +9497,7 @@ static void tag_tag_snapshot_instance_init (TagTagSnapshot * self) {
 #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, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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"
@@ -9607,7 +9607,7 @@ 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 = tag_tag_proxy_real_reconstitute;
+	((SourceProxyClass *) klass)->reconstitute = (DataSource* (*)(SourceProxy*, gint64, SourceSnapshot*)) tag_tag_proxy_real_reconstitute;
 #line 9612 "Tag.c"
 }
 
@@ -9634,19 +9634,19 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
diff --git a/src/Thumbnail.c b/src/Thumbnail.c
index c42e9ce..a368b97 100644
--- a/src/Thumbnail.c
+++ b/src/Thumbnail.c
@@ -1,4 +1,4 @@
-/* Thumbnail.c generated by valac 0.34.4, the Vala compiler
+/* Thumbnail.c generated by valac 0.34.7, the Vala compiler
  * generated from Thumbnail.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 = 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 = 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 = thumbnail_real_exposed;
+	((CheckerboardItemClass *) klass)->exposed = (void (*)(CheckerboardItem*)) thumbnail_real_exposed;
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
-	((CheckerboardItemClass *) klass)->unexposed = 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 = 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 = 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"
diff --git a/src/ThumbnailCache.c b/src/ThumbnailCache.c
index c65d22e..0dac00c 100644
--- a/src/ThumbnailCache.c
+++ b/src/ThumbnailCache.c
@@ -1,4 +1,4 @@
-/* ThumbnailCache.c generated by valac 0.34.4, the Vala compiler
+/* ThumbnailCache.c generated by valac 0.34.7, the Vala compiler
  * generated from ThumbnailCache.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -912,7 +912,7 @@ static void thumbnails_instance_init (Thumbnails * self) {
 #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	self->priv = THUMBNAILS_GET_PRIVATE (self);
 #line 8 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
-	_tmp0_ = gee_hash_map_new (THUMBNAIL_CACHE_TYPE_SIZE, NULL, NULL, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (THUMBNAIL_CACHE_TYPE_SIZE, NULL, NULL, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 8 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	self->priv->map = _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -3338,7 +3338,7 @@ static void thumbnail_cache_store_in_memory (ThumbnailCache* self, const gchar*
 #line 582 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp17_ = self->priv->cache_lru;
 #line 582 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
-		_tmp18_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp18_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 582 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp19_ = _tmp18_;
 #line 582 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -3346,7 +3346,7 @@ static void thumbnail_cache_store_in_memory (ThumbnailCache* self, const gchar*
 #line 583 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp20_ = self->priv->cache_lru;
 #line 583 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
-		_tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 583 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp22_ = _tmp21_;
 #line 583 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4396,9 +4396,9 @@ 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 = 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 = thumbnail_cache_async_fetch_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) thumbnail_cache_async_fetch_job_real_execute;
 #line 4402 "ThumbnailCache.c"
 }
 
@@ -4478,11 +4478,11 @@ static void thumbnail_cache_instance_init (ThumbnailCache * self) {
 #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"
-	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, THUMBNAIL_CACHE_TYPE_IMAGE_DATA, (GBoxedCopyFunc) thumbnail_cache_image_data_ref, thumbnail_cache_image_data_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, THUMBNAIL_CACHE_TYPE_IMAGE_DATA, (GBoxedCopyFunc) thumbnail_cache_image_data_ref, (GDestroyNotify) thumbnail_cache_image_data_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 186 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	self->priv->cache_map = _tmp0_;
 #line 187 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
-	_tmp1_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+	_tmp1_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 187 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	self->priv->cache_lru = _tmp1_;
 #line 188 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
diff --git a/src/TimedQueue.c b/src/TimedQueue.c
index b2ba07c..2139827 100644
--- a/src/TimedQueue.c
+++ b/src/TimedQueue.c
@@ -1,4 +1,4 @@
-/* TimedQueue.c generated by valac 0.34.4, the Vala compiler
+/* TimedQueue.c generated by valac 0.34.7, the Vala compiler
  * generated from TimedQueue.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -307,6 +307,10 @@ TimedQueue* timed_queue_construct (GType object_type, GType g_type, GBoxedCopyFu
 #line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp3__target_destroy_notify = equal_func_target_destroy_notify;
 #line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala"
+		equal_func = NULL;
+#line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala"
+		equal_func_target = NULL;
+#line 58 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		equal_func_target_destroy_notify = NULL;
 #line 58 "/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);
@@ -322,7 +326,7 @@ 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 326 "TimedQueue.c"
+#line 330 "TimedQueue.c"
 	} else {
 		void* _tmp4_ = NULL;
 		GDestroyNotify _tmp5_ = NULL;
@@ -343,14 +347,14 @@ 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 347 "TimedQueue.c"
+#line 351 "TimedQueue.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp7_ = priority;
 #line 62 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self->priv->priority = _tmp7_;
 #line 64 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	_tmp8_ = sorted_list_new (TIMED_QUEUE_TYPE_ELEMENT, (GBoxedCopyFunc) timed_queue_element_ref, timed_queue_element_unref, _timed_queue_element_comparator_comparator, NULL);
+	_tmp8_ = sorted_list_new (TIMED_QUEUE_TYPE_ELEMENT, (GBoxedCopyFunc) timed_queue_element_ref, (GDestroyNotify) timed_queue_element_unref, _timed_queue_element_comparator_comparator, NULL);
 #line 64 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_g_object_unref0 (self->priv->queue);
 #line 64 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -373,14 +377,14 @@ 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 377 "TimedQueue.c"
+#line 381 "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 384 "TimedQueue.c"
+#line 388 "TimedQueue.c"
 }
 
 
@@ -395,7 +399,7 @@ guint timed_queue_get_dequeue_spacing_msec (TimedQueue* self) {
 	result = _tmp0_;
 #line 75 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 399 "TimedQueue.c"
+#line 403 "TimedQueue.c"
 }
 
 
@@ -417,19 +421,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 421 "TimedQueue.c"
+#line 425 "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 427 "TimedQueue.c"
+#line 431 "TimedQueue.c"
 		guint _tmp3_ = 0U;
 #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 433 "TimedQueue.c"
+#line 437 "TimedQueue.c"
 	}
 #line 85 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp4_ = msec;
@@ -443,7 +447,7 @@ 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 447 "TimedQueue.c"
+#line 451 "TimedQueue.c"
 }
 
 
@@ -458,20 +462,20 @@ static guint timed_queue_get_heartbeat_timeout (TimedQueue* self) {
 	_tmp1_ = self->priv->dequeue_spacing_msec;
 #line 91 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	if (_tmp1_ == ((guint) 0)) {
-#line 462 "TimedQueue.c"
+#line 466 "TimedQueue.c"
 		guint _tmp2_ = 0U;
 #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 468 "TimedQueue.c"
+#line 472 "TimedQueue.c"
 	} else {
 		guint _tmp3_ = 0U;
 #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 475 "TimedQueue.c"
+#line 479 "TimedQueue.c"
 	}
 #line 91 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp4_ = CLAMP (_tmp0_, (guint) 10, G_MAXUINT);
@@ -479,7 +483,7 @@ static guint timed_queue_get_heartbeat_timeout (TimedQueue* self) {
 	result = _tmp4_;
 #line 91 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 483 "TimedQueue.c"
+#line 487 "TimedQueue.c"
 }
 
 
@@ -495,7 +499,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 499 "TimedQueue.c"
+#line 503 "TimedQueue.c"
 }
 
 
@@ -504,7 +508,7 @@ 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 508 "TimedQueue.c"
+#line 512 "TimedQueue.c"
 }
 
 
@@ -519,7 +523,7 @@ gboolean timed_queue_is_paused (TimedQueue* self) {
 	result = _tmp0_;
 #line 101 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 523 "TimedQueue.c"
+#line 527 "TimedQueue.c"
 }
 
 
@@ -533,13 +537,13 @@ void timed_queue_pause (TimedQueue* self) {
 	if (_tmp0_) {
 #line 106 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return;
-#line 537 "TimedQueue.c"
+#line 541 "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 543 "TimedQueue.c"
+#line 547 "TimedQueue.c"
 }
 
 
@@ -553,13 +557,13 @@ void timed_queue_unpause (TimedQueue* self) {
 	if (!_tmp0_) {
 #line 115 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return;
-#line 557 "TimedQueue.c"
+#line 561 "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 563 "TimedQueue.c"
+#line 567 "TimedQueue.c"
 }
 
 
@@ -569,7 +573,7 @@ static void timed_queue_real_clear (TimedQueue* self) {
 	_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 573 "TimedQueue.c"
+#line 577 "TimedQueue.c"
 }
 
 
@@ -578,7 +582,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 582 "TimedQueue.c"
+#line 586 "TimedQueue.c"
 }
 
 
@@ -596,7 +600,7 @@ 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 600 "TimedQueue.c"
+#line 604 "TimedQueue.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			TimedQueueElement* e = NULL;
@@ -616,7 +620,7 @@ static gboolean timed_queue_real_contains (TimedQueue* self, gconstpointer item)
 			if (!_tmp3_) {
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 620 "TimedQueue.c"
+#line 624 "TimedQueue.c"
 			}
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp4_ = _e_it;
@@ -646,21 +650,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 650 "TimedQueue.c"
+#line 654 "TimedQueue.c"
 			}
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_timed_queue_element_unref0 (e);
-#line 654 "TimedQueue.c"
+#line 658 "TimedQueue.c"
 		}
 #line 127 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_g_object_unref0 (_e_it);
-#line 658 "TimedQueue.c"
+#line 662 "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 664 "TimedQueue.c"
+#line 668 "TimedQueue.c"
 }
 
 
@@ -669,7 +673,7 @@ 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 673 "TimedQueue.c"
+#line 677 "TimedQueue.c"
 }
 
 
@@ -689,7 +693,7 @@ static gboolean timed_queue_real_enqueue (TimedQueue* self, gconstpointer item)
 #line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp2_ = timed_queue_calc_ready_time (self);
 #line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	_tmp3_ = timed_queue_element_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, self->priv->g_destroy_func, _tmp1_, _tmp2_);
+	_tmp3_ = timed_queue_element_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, (GDestroyNotify) self->priv->g_destroy_func, _tmp1_, _tmp2_);
 #line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp4_ = _tmp3_;
 #line 136 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -702,7 +706,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 706 "TimedQueue.c"
+#line 710 "TimedQueue.c"
 }
 
 
@@ -711,7 +715,7 @@ 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 715 "TimedQueue.c"
+#line 719 "TimedQueue.c"
 }
 
 
@@ -731,10 +735,10 @@ static gboolean timed_queue_real_enqueue_many (TimedQueue* self, GeeCollection*
 #line 140 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	ready_time = _tmp0_;
 #line 142 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	_tmp1_ = gee_array_list_new (TIMED_QUEUE_TYPE_ELEMENT, (GBoxedCopyFunc) timed_queue_element_ref, timed_queue_element_unref, NULL, NULL, NULL);
+	_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 738 "TimedQueue.c"
+#line 742 "TimedQueue.c"
 	{
 		GeeIterator* _item_it = NULL;
 		GeeCollection* _tmp2_ = NULL;
@@ -747,7 +751,7 @@ 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 751 "TimedQueue.c"
+#line 755 "TimedQueue.c"
 			GeeIterator* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
 			gpointer item = NULL;
@@ -766,7 +770,7 @@ static gboolean timed_queue_real_enqueue_many (TimedQueue* self, GeeCollection*
 			if (!_tmp5_) {
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 770 "TimedQueue.c"
+#line 774 "TimedQueue.c"
 			}
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp6_ = _item_it;
@@ -781,7 +785,7 @@ static gboolean timed_queue_real_enqueue_many (TimedQueue* self, GeeCollection*
 #line 144 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp10_ = ready_time;
 #line 144 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-			_tmp11_ = timed_queue_element_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, self->priv->g_destroy_func, _tmp9_, _tmp10_);
+			_tmp11_ = timed_queue_element_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, (GDestroyNotify) self->priv->g_destroy_func, _tmp9_, _tmp10_);
 #line 144 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp12_ = _tmp11_;
 #line 144 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -790,11 +794,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 794 "TimedQueue.c"
+#line 798 "TimedQueue.c"
 		}
 #line 143 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_g_object_unref0 (_item_it);
-#line 798 "TimedQueue.c"
+#line 802 "TimedQueue.c"
 	}
 #line 146 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp13_ = self->priv->queue;
@@ -808,7 +812,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 812 "TimedQueue.c"
+#line 816 "TimedQueue.c"
 }
 
 
@@ -817,7 +821,7 @@ 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 821 "TimedQueue.c"
+#line 825 "TimedQueue.c"
 }
 
 
@@ -834,7 +838,7 @@ 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 838 "TimedQueue.c"
+#line 842 "TimedQueue.c"
 		GeeIterator* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		TimedQueueElement* e = NULL;
@@ -854,7 +858,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 858 "TimedQueue.c"
+#line 862 "TimedQueue.c"
 		}
 #line 152 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp4_ = iter;
@@ -876,7 +880,7 @@ 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 880 "TimedQueue.c"
+#line 884 "TimedQueue.c"
 			GeeIterator* _tmp11_ = NULL;
 #line 154 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp11_ = iter;
@@ -890,11 +894,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 894 "TimedQueue.c"
+#line 898 "TimedQueue.c"
 		}
 #line 151 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_timed_queue_element_unref0 (e);
-#line 898 "TimedQueue.c"
+#line 902 "TimedQueue.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	result = FALSE;
@@ -902,7 +906,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 906 "TimedQueue.c"
+#line 910 "TimedQueue.c"
 }
 
 
@@ -911,7 +915,7 @@ 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 915 "TimedQueue.c"
+#line 919 "TimedQueue.c"
 }
 
 
@@ -929,7 +933,7 @@ 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 933 "TimedQueue.c"
+#line 937 "TimedQueue.c"
 }
 
 
@@ -947,18 +951,18 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 		result = TRUE;
 #line 175 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return result;
-#line 951 "TimedQueue.c"
+#line 955 "TimedQueue.c"
 	}
 #line 177 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	now = (gulong) 0;
-#line 955 "TimedQueue.c"
+#line 959 "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 962 "TimedQueue.c"
+#line 966 "TimedQueue.c"
 			SortedList* _tmp2_ = NULL;
 			gint _tmp3_ = 0;
 			gint _tmp4_ = 0;
@@ -983,7 +987,7 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 			guint _tmp25_ = 0U;
 #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			if (!_tmp1_) {
-#line 987 "TimedQueue.c"
+#line 991 "TimedQueue.c"
 			}
 #line 179 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp1_ = FALSE;
@@ -997,7 +1001,7 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 			if (_tmp4_ == 0) {
 #line 181 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 1001 "TimedQueue.c"
+#line 1005 "TimedQueue.c"
 			}
 #line 183 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp5_ = self->priv->queue;
@@ -1013,13 +1017,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 1017 "TimedQueue.c"
+#line 1021 "TimedQueue.c"
 				gulong _tmp9_ = 0UL;
 #line 187 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				_tmp9_ = now_ms ();
 #line 187 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				now = _tmp9_;
-#line 1023 "TimedQueue.c"
+#line 1027 "TimedQueue.c"
 			}
 #line 189 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp10_ = head;
@@ -1033,13 +1037,13 @@ static gboolean timed_queue_on_heartbeat (TimedQueue* self) {
 				_timed_queue_element_unref0 (head);
 #line 190 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				break;
-#line 1037 "TimedQueue.c"
+#line 1041 "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 1043 "TimedQueue.c"
+#line 1047 "TimedQueue.c"
 				gulong _tmp15_ = 0UL;
 				gulong _tmp16_ = 0UL;
 				guint _tmp17_ = 0U;
@@ -1051,11 +1055,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 1055 "TimedQueue.c"
+#line 1059 "TimedQueue.c"
 			} else {
 #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				_tmp13_ = FALSE;
-#line 1059 "TimedQueue.c"
+#line 1063 "TimedQueue.c"
 			}
 #line 193 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			if (_tmp13_) {
@@ -1063,7 +1067,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 1067 "TimedQueue.c"
+#line 1071 "TimedQueue.c"
 			}
 #line 196 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp18_ = self->priv->queue;
@@ -1097,20 +1101,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 1101 "TimedQueue.c"
+#line 1105 "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 1107 "TimedQueue.c"
+#line 1111 "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 1114 "TimedQueue.c"
+#line 1118 "TimedQueue.c"
 }
 
 
@@ -1119,7 +1123,7 @@ 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 1123 "TimedQueue.c"
+#line 1127 "TimedQueue.c"
 }
 
 
@@ -1141,7 +1145,7 @@ static gint timed_queue_real_get_size (TimedQueue* base) {
 	result = _tmp2_;
 #line 165 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 1145 "TimedQueue.c"
+#line 1149 "TimedQueue.c"
 }
 
 
@@ -1176,14 +1180,14 @@ 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 1180 "TimedQueue.c"
+#line 1184 "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 1187 "TimedQueue.c"
+#line 1191 "TimedQueue.c"
 }
 
 
@@ -1205,14 +1209,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 1209 "TimedQueue.c"
+#line 1213 "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 1216 "TimedQueue.c"
+#line 1220 "TimedQueue.c"
 }
 
 
@@ -1221,7 +1225,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 1225 "TimedQueue.c"
+#line 1229 "TimedQueue.c"
 	}
 }
 
@@ -1231,11 +1235,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 1235 "TimedQueue.c"
+#line 1239 "TimedQueue.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1239 "TimedQueue.c"
+#line 1243 "TimedQueue.c"
 	}
 }
 
@@ -1243,37 +1247,37 @@ 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 1247 "TimedQueue.c"
+#line 1251 "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 1254 "TimedQueue.c"
+#line 1258 "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 1261 "TimedQueue.c"
+#line 1265 "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 1265 "TimedQueue.c"
+#line 1269 "TimedQueue.c"
 		}
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = timed_queue_element_ref (object);
-#line 1269 "TimedQueue.c"
+#line 1273 "TimedQueue.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1273 "TimedQueue.c"
+#line 1277 "TimedQueue.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return NULL;
-#line 1277 "TimedQueue.c"
+#line 1281 "TimedQueue.c"
 }
 
 
@@ -1284,25 +1288,25 @@ static gchar* timed_queue_value_element_lcopy_value (const GValue* value, guint
 	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 1288 "TimedQueue.c"
+#line 1292 "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 1294 "TimedQueue.c"
+#line 1298 "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 1298 "TimedQueue.c"
+#line 1302 "TimedQueue.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		*object_p = timed_queue_element_ref (value->data[0].v_pointer);
-#line 1302 "TimedQueue.c"
+#line 1306 "TimedQueue.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return NULL;
-#line 1306 "TimedQueue.c"
+#line 1310 "TimedQueue.c"
 }
 
 
@@ -1316,7 +1320,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 1320 "TimedQueue.c"
+#line 1324 "TimedQueue.c"
 }
 
 
@@ -1325,7 +1329,7 @@ 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 1329 "TimedQueue.c"
+#line 1333 "TimedQueue.c"
 }
 
 
@@ -1345,17 +1349,17 @@ 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 1349 "TimedQueue.c"
+#line 1353 "TimedQueue.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1353 "TimedQueue.c"
+#line 1357 "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 1359 "TimedQueue.c"
+#line 1363 "TimedQueue.c"
 	}
 }
 
@@ -1374,17 +1378,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 1378 "TimedQueue.c"
+#line 1382 "TimedQueue.c"
 	} else {
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1382 "TimedQueue.c"
+#line 1386 "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 1388 "TimedQueue.c"
+#line 1392 "TimedQueue.c"
 	}
 }
 
@@ -1396,7 +1400,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 1400 "TimedQueue.c"
+#line 1404 "TimedQueue.c"
 }
 
 
@@ -1405,7 +1409,7 @@ 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 1409 "TimedQueue.c"
+#line 1413 "TimedQueue.c"
 }
 
 
@@ -1417,7 +1421,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 1421 "TimedQueue.c"
+#line 1425 "TimedQueue.c"
 }
 
 
@@ -1442,7 +1446,7 @@ static gpointer timed_queue_element_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 22 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return instance;
-#line 1446 "TimedQueue.c"
+#line 1450 "TimedQueue.c"
 }
 
 
@@ -1455,7 +1459,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 1459 "TimedQueue.c"
+#line 1463 "TimedQueue.c"
 	}
 }
 
@@ -1463,7 +1467,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 1467 "TimedQueue.c"
+#line 1471 "TimedQueue.c"
 }
 
 
@@ -1472,7 +1476,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 1476 "TimedQueue.c"
+#line 1480 "TimedQueue.c"
 	}
 }
 
@@ -1482,11 +1486,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 1486 "TimedQueue.c"
+#line 1490 "TimedQueue.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1490 "TimedQueue.c"
+#line 1494 "TimedQueue.c"
 	}
 }
 
@@ -1494,37 +1498,37 @@ 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 1498 "TimedQueue.c"
+#line 1502 "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 1505 "TimedQueue.c"
+#line 1509 "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 1512 "TimedQueue.c"
+#line 1516 "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 1516 "TimedQueue.c"
+#line 1520 "TimedQueue.c"
 		}
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = timed_queue_ref (object);
-#line 1520 "TimedQueue.c"
+#line 1524 "TimedQueue.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1524 "TimedQueue.c"
+#line 1528 "TimedQueue.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return NULL;
-#line 1528 "TimedQueue.c"
+#line 1532 "TimedQueue.c"
 }
 
 
@@ -1535,25 +1539,25 @@ static gchar* value_timed_queue_lcopy_value (const GValue* value, guint n_collec
 	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 1539 "TimedQueue.c"
+#line 1543 "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 1545 "TimedQueue.c"
+#line 1549 "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 1549 "TimedQueue.c"
+#line 1553 "TimedQueue.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		*object_p = timed_queue_ref (value->data[0].v_pointer);
-#line 1553 "TimedQueue.c"
+#line 1557 "TimedQueue.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return NULL;
-#line 1557 "TimedQueue.c"
+#line 1561 "TimedQueue.c"
 }
 
 
@@ -1567,7 +1571,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 1571 "TimedQueue.c"
+#line 1575 "TimedQueue.c"
 }
 
 
@@ -1576,7 +1580,7 @@ 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 1580 "TimedQueue.c"
+#line 1584 "TimedQueue.c"
 }
 
 
@@ -1596,17 +1600,17 @@ 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 1600 "TimedQueue.c"
+#line 1604 "TimedQueue.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1604 "TimedQueue.c"
+#line 1608 "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 1610 "TimedQueue.c"
+#line 1614 "TimedQueue.c"
 	}
 }
 
@@ -1625,17 +1629,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 1629 "TimedQueue.c"
+#line 1633 "TimedQueue.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		value->data[0].v_pointer = NULL;
-#line 1633 "TimedQueue.c"
+#line 1637 "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 1639 "TimedQueue.c"
+#line 1643 "TimedQueue.c"
 	}
 }
 
@@ -1648,24 +1652,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 = 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 = 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 = 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 = 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 = 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 = 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 1669 "TimedQueue.c"
+#line 1673 "TimedQueue.c"
 }
 
 
@@ -1682,7 +1686,7 @@ 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 1686 "TimedQueue.c"
+#line 1690 "TimedQueue.c"
 }
 
 
@@ -1697,13 +1701,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 1701 "TimedQueue.c"
+#line 1705 "TimedQueue.c"
 		guint _tmp1_ = 0U;
 #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 1707 "TimedQueue.c"
+#line 1711 "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);
@@ -1715,7 +1719,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 1719 "TimedQueue.c"
+#line 1723 "TimedQueue.c"
 }
 
 
@@ -1740,7 +1744,7 @@ gpointer timed_queue_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 21 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return instance;
-#line 1744 "TimedQueue.c"
+#line 1748 "TimedQueue.c"
 }
 
 
@@ -1753,7 +1757,7 @@ 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 1757 "TimedQueue.c"
+#line 1761 "TimedQueue.c"
 	}
 }
 
@@ -1787,11 +1791,15 @@ HashTimedQueue* hash_timed_queue_construct (GType object_type, GType g_type, GBo
 #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp2__target_destroy_notify = equal_func_target_destroy_notify;
 #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala"
+	equal_func = NULL;
+#line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala"
+	equal_func_target = NULL;
+#line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	equal_func_target_destroy_notify = NULL;
 #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp3_ = priority;
 #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	self = (HashTimedQueue*) timed_queue_construct (object_type, g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func, _tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp2__target, _tmp2__target_destroy_notify, _tmp3_);
+	self = (HashTimedQueue*) timed_queue_construct (object_type, g_type, (GBoxedCopyFunc) g_dup_func, (GDestroyNotify) g_destroy_func, _tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp2__target, _tmp2__target_destroy_notify, _tmp3_);
 #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	self->priv->g_type = g_type;
 #line 220 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1805,6 +1813,10 @@ HashTimedQueue* hash_timed_queue_construct (GType object_type, GType g_type, GBo
 #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp4__target_destroy_notify = hash_func_target_destroy_notify;
 #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
+	hash_func = NULL;
+#line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
+	hash_func_target = NULL;
+#line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	hash_func_target_destroy_notify = NULL;
 #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp5_ = equal_func;
@@ -1813,9 +1825,13 @@ HashTimedQueue* hash_timed_queue_construct (GType object_type, GType g_type, GBo
 #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp5__target_destroy_notify = equal_func_target_destroy_notify;
 #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
+	equal_func = NULL;
+#line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
+	equal_func_target = NULL;
+#line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	equal_func_target_destroy_notify = NULL;
 #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
-	_tmp6_ = gee_hash_map_new (g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func, G_TYPE_INT, NULL, NULL, _tmp4_, _tmp4__target, _tmp4__target_destroy_notify, _tmp5_, _tmp5__target, _tmp5__target_destroy_notify, NULL, NULL, NULL);
+	_tmp6_ = gee_hash_map_new (g_type, (GBoxedCopyFunc) g_dup_func, (GDestroyNotify) g_destroy_func, G_TYPE_INT, NULL, NULL, _tmp4_, _tmp4__target, _tmp4__target_destroy_notify, _tmp5_, _tmp5__target, _tmp5__target_destroy_notify, NULL, NULL, NULL);
 #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_g_object_unref0 (self->priv->item_count);
 #line 222 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -1838,14 +1854,14 @@ 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 1842 "TimedQueue.c"
+#line 1858 "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 1849 "TimedQueue.c"
+#line 1865 "TimedQueue.c"
 }
 
 
@@ -1863,7 +1879,7 @@ 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 1867 "TimedQueue.c"
+#line 1883 "TimedQueue.c"
 }
 
 
@@ -1878,7 +1894,7 @@ 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 1882 "TimedQueue.c"
+#line 1898 "TimedQueue.c"
 }
 
 
@@ -1900,7 +1916,7 @@ static gboolean hash_timed_queue_real_contains (TimedQueue* base, gconstpointer
 	result = _tmp2_;
 #line 238 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	return result;
-#line 1904 "TimedQueue.c"
+#line 1920 "TimedQueue.c"
 }
 
 
@@ -1927,7 +1943,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 1931 "TimedQueue.c"
+#line 1947 "TimedQueue.c"
 	}
 #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp3_ = self->priv->item_count;
@@ -1937,7 +1953,7 @@ 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 1941 "TimedQueue.c"
+#line 1957 "TimedQueue.c"
 		GeeHashMap* _tmp6_ = NULL;
 		gconstpointer _tmp7_ = NULL;
 		gpointer _tmp8_ = NULL;
@@ -1949,11 +1965,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 1953 "TimedQueue.c"
+#line 1969 "TimedQueue.c"
 	} else {
 #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_tmp2_ = 1;
-#line 1957 "TimedQueue.c"
+#line 1973 "TimedQueue.c"
 	}
 #line 245 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp9_ = self->priv->item_count;
@@ -1965,7 +1981,7 @@ 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 1969 "TimedQueue.c"
+#line 1985 "TimedQueue.c"
 }
 
 
@@ -1988,7 +2004,7 @@ 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 1992 "TimedQueue.c"
+#line 2008 "TimedQueue.c"
 	}
 	{
 		GeeIterator* _item_it = NULL;
@@ -2002,7 +2018,7 @@ 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 2006 "TimedQueue.c"
+#line 2022 "TimedQueue.c"
 			GeeIterator* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
 			gpointer item = NULL;
@@ -2022,7 +2038,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 2026 "TimedQueue.c"
+#line 2042 "TimedQueue.c"
 			}
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp6_ = _item_it;
@@ -2038,7 +2054,7 @@ 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 2042 "TimedQueue.c"
+#line 2058 "TimedQueue.c"
 				GeeHashMap* _tmp12_ = NULL;
 				gconstpointer _tmp13_ = NULL;
 				gpointer _tmp14_ = NULL;
@@ -2050,11 +2066,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 2054 "TimedQueue.c"
+#line 2070 "TimedQueue.c"
 			} else {
 #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 				_tmp8_ = 1;
-#line 2058 "TimedQueue.c"
+#line 2074 "TimedQueue.c"
 			}
 #line 255 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 			_tmp15_ = self->priv->item_count;
@@ -2064,17 +2080,17 @@ 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 2068 "TimedQueue.c"
+#line 2084 "TimedQueue.c"
 		}
 #line 254 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		_g_object_unref0 (_item_it);
-#line 2072 "TimedQueue.c"
+#line 2088 "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 2078 "TimedQueue.c"
+#line 2094 "TimedQueue.c"
 }
 
 
@@ -2096,7 +2112,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 2100 "TimedQueue.c"
+#line 2116 "TimedQueue.c"
 	}
 #line 264 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp2_ = item;
@@ -2106,7 +2122,7 @@ 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 2110 "TimedQueue.c"
+#line 2126 "TimedQueue.c"
 }
 
 
@@ -2133,7 +2149,7 @@ static void hash_timed_queue_removed (HashTimedQueue* self, gconstpointer item)
 	if (!_tmp2_) {
 #line 273 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 		return;
-#line 2137 "TimedQueue.c"
+#line 2153 "TimedQueue.c"
 	}
 #line 275 "/home/jens/Source/shotwell/src/TimedQueue.vala"
 	_tmp3_ = self->priv->item_count;
@@ -2155,7 +2171,7 @@ 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 2159 "TimedQueue.c"
+#line 2175 "TimedQueue.c"
 		GeeHashMap* _tmp9_ = NULL;
 		gconstpointer _tmp10_ = NULL;
 #line 279 "/home/jens/Source/shotwell/src/TimedQueue.vala"
@@ -2164,7 +2180,7 @@ static void hash_timed_queue_removed (HashTimedQueue* self, gconstpointer item)
 		_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 2168 "TimedQueue.c"
+#line 2184 "TimedQueue.c"
 	} else {
 		GeeHashMap* _tmp11_ = NULL;
 		gconstpointer _tmp12_ = NULL;
@@ -2177,7 +2193,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 2181 "TimedQueue.c"
+#line 2197 "TimedQueue.c"
 	}
 }
 
@@ -2190,25 +2206,25 @@ 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 = 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 = 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 = 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 = 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 = 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 = hash_timed_queue_real_remove_first;
-#line 2205 "TimedQueue.c"
+	((TimedQueueClass *) klass)->remove_first = (gboolean (*)(TimedQueue*, gconstpointer)) hash_timed_queue_real_remove_first;
+#line 2221 "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 2212 "TimedQueue.c"
+#line 2228 "TimedQueue.c"
 }
 
 
@@ -2220,7 +2236,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 2224 "TimedQueue.c"
+#line 2240 "TimedQueue.c"
 }
 
 
diff --git a/src/Tombstone.c b/src/Tombstone.c
index 2107053..d660e10 100644
--- a/src/Tombstone.c
+++ b/src/Tombstone.c
@@ -1,4 +1,4 @@
-/* Tombstone.c generated by valac 0.34.4, the Vala compiler
+/* Tombstone.c generated by valac 0.34.7, the Vala compiler
  * generated from Tombstone.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1890,11 +1890,11 @@ 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 = 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 = 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 = tombstone_source_collection_real_notify_items_altered;
+	((DataCollectionClass *) klass)->notify_items_altered = (void (*)(DataCollection*, GeeMap*)) tombstone_source_collection_real_notify_items_altered;
 #line 1898 "Tombstone.c"
 }
 
@@ -1904,7 +1904,7 @@ static void tombstone_source_collection_instance_init (TombstoneSourceCollection
 #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, g_object_unref, TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_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"
@@ -2452,7 +2452,7 @@ void tombstone_init (void) {
 		GeeCollection* _tmp19_ = NULL;
 		GeeCollection* _tmp20_ = NULL;
 #line 217 "/home/jens/Source/shotwell/src/Tombstone.vala"
-		_tmp10_ = gee_array_list_new (TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+		_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"
 		tombstones = _tmp10_;
 #line 218 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2542,7 +2542,7 @@ void tombstone_entomb_many_sources (GeeCollection* sources, TombstoneReason reas
 #line 228 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
 #line 230 "/home/jens/Source/shotwell/src/Tombstone.vala"
-	_tmp0_ = gee_array_list_new (TYPE_TOMBSTONED_FILE, (GBoxedCopyFunc) tombstoned_file_ref, tombstoned_file_unref, NULL, NULL, NULL);
+	_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"
@@ -2800,7 +2800,7 @@ void tombstone_entomb_many_files (GeeCollection* files, TombstoneReason reason,
 #line 249 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp16_, FALSE, NULL, NULL, NULL);
 #line 251 "/home/jens/Source/shotwell/src/Tombstone.vala"
-	_tmp17_ = gee_array_list_new (TYPE_TOMBSTONE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
@@ -3508,15 +3508,15 @@ 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 = 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 = 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 = 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 = 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 = 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"
diff --git a/src/UnityProgressBar.c b/src/UnityProgressBar.c
index 2cbcab3..a2854be 100644
--- a/src/UnityProgressBar.c
+++ b/src/UnityProgressBar.c
@@ -1,4 +1,4 @@
-/* UnityProgressBar.c generated by valac 0.34.4, the Vala compiler
+/* UnityProgressBar.c generated by valac 0.34.7, 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 1ebf302..a402c40 100644
--- a/src/Upgrades.c
+++ b/src/Upgrades.c
@@ -1,4 +1,4 @@
-/* Upgrades.c generated by valac 0.34.4, the Vala compiler
+/* Upgrades.c generated by valac 0.34.7, the Vala compiler
  * generated from Upgrades.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -712,7 +712,7 @@ void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_ta
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp2_ = _task_list;
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
-		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp4_ = _tmp3_;
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -999,7 +999,7 @@ static void upgrades_instance_init (Upgrades * self) {
 #line 12 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self->priv->total_steps = (guint64) 0;
 #line 13 "/home/jens/Source/shotwell/src/Upgrades.vala"
-	_tmp0_ = gee_linked_list_new (TYPE_UPGRADE_TASK, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_linked_list_new (TYPE_UPGRADE_TASK, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 13 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self->priv->task_list = _tmp0_;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1105,7 +1105,7 @@ GType upgrade_task_get_type (void) {
 static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) {
 	MimicsRemovalTask * self;
 	guint64 result = 0ULL;
-	guint64 _tmp5_ = 0ULL;
+	guint64 _tmp6_ = 0ULL;
 	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);
@@ -1152,21 +1152,23 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) {
 	__finally593:
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1156 "Upgrades.c"
+		guint64 _tmp5_ = 0ULL;
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.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 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		g_clear_error (&_inner_error_);
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
-		return 0ULL;
-#line 1162 "Upgrades.c"
+		return _tmp5_;
+#line 1164 "Upgrades.c"
 	}
 #line 77 "/home/jens/Source/shotwell/src/Upgrades.vala"
-	_tmp5_ = self->priv->num_mimics;
+	_tmp6_ = self->priv->num_mimics;
 #line 77 "/home/jens/Source/shotwell/src/Upgrades.vala"
-	result = _tmp5_;
+	result = _tmp6_;
 #line 77 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return result;
-#line 1170 "Upgrades.c"
+#line 1172 "Upgrades.c"
 }
 
 
@@ -1175,7 +1177,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 	GError * _inner_error_ = NULL;
 #line 80 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MIMICS_REMOVAL_TASK, MimicsRemovalTask);
-#line 1179 "Upgrades.c"
+#line 1181 "Upgrades.c"
 	{
 		GFile* _tmp0_ = NULL;
 		ProgressMonitor _tmp1_ = NULL;
@@ -1194,7 +1196,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 		delete_all_files (_tmp0_, NULL, _tmp1_, _tmp1__target, _tmp2_, NULL, &_inner_error_);
 #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1198 "Upgrades.c"
+#line 1200 "Upgrades.c"
 			goto __catch594_g_error;
 		}
 #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1203,7 +1205,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 		g_file_delete (_tmp3_, NULL, &_inner_error_);
 #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1207 "Upgrades.c"
+#line 1209 "Upgrades.c"
 			goto __catch594_g_error;
 		}
 	}
@@ -1225,7 +1227,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 		g_debug ("Upgrades.vala:85: Could not delete mimics: %s", _tmp5_);
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_g_error_free0 (e);
-#line 1229 "Upgrades.c"
+#line 1231 "Upgrades.c"
 	}
 	__finally594:
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1236,7 +1238,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 		g_clear_error (&_inner_error_);
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		return;
-#line 1240 "Upgrades.c"
+#line 1242 "Upgrades.c"
 	}
 }
 
@@ -1247,14 +1249,14 @@ MimicsRemovalTask* mimics_removal_task_construct (GType object_type) {
 	self = (MimicsRemovalTask*) g_object_new (object_type, NULL);
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return self;
-#line 1251 "Upgrades.c"
+#line 1253 "Upgrades.c"
 }
 
 
 MimicsRemovalTask* mimics_removal_task_new (void) {
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return mimics_removal_task_construct (TYPE_MIMICS_REMOVAL_TASK);
-#line 1258 "Upgrades.c"
+#line 1260 "Upgrades.c"
 }
 
 
@@ -1265,7 +1267,7 @@ static void mimics_removal_task_class_init (MimicsRemovalTaskClass * klass) {
 	g_type_class_add_private (klass, sizeof (MimicsRemovalTaskPrivate));
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	G_OBJECT_CLASS (klass)->finalize = mimics_removal_task_finalize;
-#line 1269 "Upgrades.c"
+#line 1271 "Upgrades.c"
 }
 
 
@@ -1276,7 +1278,7 @@ static void mimics_removal_task_upgrade_task_interface_init (UpgradeTaskIface *
 	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;
-#line 1280 "Upgrades.c"
+#line 1282 "Upgrades.c"
 }
 
 
@@ -1298,7 +1300,7 @@ static void mimics_removal_task_instance_init (MimicsRemovalTask * self) {
 	_g_object_unref0 (_tmp1_);
 #line 69 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self->priv->num_mimics = (guint64) 0;
-#line 1302 "Upgrades.c"
+#line 1304 "Upgrades.c"
 }
 
 
@@ -1310,7 +1312,7 @@ static void mimics_removal_task_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->mimic_dir);
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	G_OBJECT_CLASS (mimics_removal_task_parent_class)->finalize (obj);
-#line 1314 "Upgrades.c"
+#line 1316 "Upgrades.c"
 }
 
 
@@ -1336,7 +1338,7 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base)
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FIXUP_RAW_THUMBNAILS_TASK, FixupRawThumbnailsTask);
 #line 95 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	num_raw_files = 0;
-#line 1340 "Upgrades.c"
+#line 1342 "Upgrades.c"
 	{
 		GeeArrayList* _phr_list = NULL;
 		PhotoTable* _tmp0_ = NULL;
@@ -1363,7 +1365,7 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base)
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp4_ = _phr_list;
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
-		_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp6_ = _tmp5_;
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1372,7 +1374,7 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base)
 		_phr_index = -1;
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		while (TRUE) {
-#line 1376 "Upgrades.c"
+#line 1378 "Upgrades.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -1395,7 +1397,7 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base)
 			if (!(_tmp8_ < _tmp9_)) {
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				break;
-#line 1399 "Upgrades.c"
+#line 1401 "Upgrades.c"
 			}
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			_tmp10_ = _phr_list;
@@ -1413,27 +1415,27 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base)
 			_tmp15_ = _tmp14_->file_format;
 #line 98 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			if (_tmp15_ == PHOTO_FILE_FORMAT_RAW) {
-#line 1417 "Upgrades.c"
+#line 1419 "Upgrades.c"
 				gint _tmp16_ = 0;
 #line 99 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				_tmp16_ = num_raw_files;
 #line 99 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				num_raw_files = _tmp16_ + 1;
-#line 1423 "Upgrades.c"
+#line 1425 "Upgrades.c"
 			}
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			_photo_row_unref0 (phr);
-#line 1427 "Upgrades.c"
+#line 1429 "Upgrades.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_g_object_unref0 (_phr_list);
-#line 1431 "Upgrades.c"
+#line 1433 "Upgrades.c"
 	}
 #line 101 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	result = (guint64) num_raw_files;
 #line 101 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return result;
-#line 1437 "Upgrades.c"
+#line 1439 "Upgrades.c"
 }
 
 
@@ -1443,7 +1445,7 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FIXUP_RAW_THUMBNAILS_TASK, FixupRawThumbnailsTask);
 #line 105 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	g_debug ("Upgrades.vala:105: Executing thumbnail deletion and fixup");
-#line 1447 "Upgrades.c"
+#line 1449 "Upgrades.c"
 	{
 		GeeArrayList* _phr_list = NULL;
 		PhotoTable* _tmp0_ = NULL;
@@ -1470,7 +1472,7 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp4_ = _phr_list;
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
-		_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp6_ = _tmp5_;
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1479,7 +1481,7 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 		_phr_index = -1;
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		while (TRUE) {
-#line 1483 "Upgrades.c"
+#line 1485 "Upgrades.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -1503,7 +1505,7 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 			if (!(_tmp8_ < _tmp9_)) {
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				break;
-#line 1507 "Upgrades.c"
+#line 1509 "Upgrades.c"
 			}
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			_tmp10_ = _phr_list;
@@ -1521,7 +1523,7 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 			_tmp16_ = _tmp15_->file_format;
 #line 108 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			if (_tmp16_ == PHOTO_FILE_FORMAT_RAW) {
-#line 1525 "Upgrades.c"
+#line 1527 "Upgrades.c"
 				PhotoRow* _tmp17_ = NULL;
 				RawDeveloper _tmp18_ = 0;
 #line 109 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1530,15 +1532,15 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 				_tmp18_ = _tmp17_->developer;
 #line 109 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				_tmp13_ = _tmp18_ == RAW_DEVELOPER_CAMERA;
-#line 1534 "Upgrades.c"
+#line 1536 "Upgrades.c"
 			} else {
 #line 108 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				_tmp13_ = FALSE;
-#line 1538 "Upgrades.c"
+#line 1540 "Upgrades.c"
 			}
 #line 108 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			if (_tmp13_) {
-#line 1542 "Upgrades.c"
+#line 1544 "Upgrades.c"
 				LibraryPhotoSourceCollection* _tmp19_ = NULL;
 				PhotoRow* _tmp20_ = NULL;
 				PhotoID _tmp21_ = {0};
@@ -1558,15 +1560,15 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 				thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
 #line 110 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				_g_object_unref0 (_tmp23_);
-#line 1562 "Upgrades.c"
+#line 1564 "Upgrades.c"
 			}
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			_photo_row_unref0 (phr);
-#line 1566 "Upgrades.c"
+#line 1568 "Upgrades.c"
 		}
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_g_object_unref0 (_phr_list);
-#line 1570 "Upgrades.c"
+#line 1572 "Upgrades.c"
 	}
 }
 
@@ -1577,21 +1579,21 @@ FixupRawThumbnailsTask* fixup_raw_thumbnails_task_construct (GType object_type)
 	self = (FixupRawThumbnailsTask*) g_object_new (object_type, NULL);
 #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return self;
-#line 1581 "Upgrades.c"
+#line 1583 "Upgrades.c"
 }
 
 
 FixupRawThumbnailsTask* fixup_raw_thumbnails_task_new (void) {
 #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return fixup_raw_thumbnails_task_construct (TYPE_FIXUP_RAW_THUMBNAILS_TASK);
-#line 1588 "Upgrades.c"
+#line 1590 "Upgrades.c"
 }
 
 
 static void fixup_raw_thumbnails_task_class_init (FixupRawThumbnailsTaskClass * klass) {
 #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	fixup_raw_thumbnails_task_parent_class = g_type_class_peek_parent (klass);
-#line 1595 "Upgrades.c"
+#line 1597 "Upgrades.c"
 }
 
 
@@ -1602,7 +1604,7 @@ static void fixup_raw_thumbnails_task_upgrade_task_interface_init (UpgradeTaskIf
 	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;
-#line 1606 "Upgrades.c"
+#line 1608 "Upgrades.c"
 }
 
 
diff --git a/src/VideoMetadata.c b/src/VideoMetadata.c
index f406a1a..52b5d2d 100644
--- a/src/VideoMetadata.c
+++ b/src/VideoMetadata.c
@@ -1,4 +1,4 @@
-/* VideoMetadata.c generated by valac 0.34.4, the Vala compiler
+/* VideoMetadata.c generated by valac 0.34.7, the Vala compiler
  * generated from VideoMetadata.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 = 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 = 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 = video_metadata_real_get_comment;
+	((MediaMetadataClass *) klass)->get_comment = (gchar* (*)(MediaMetadata*)) video_metadata_real_get_comment;
 #line 607 "VideoMetadata.c"
 }
 
@@ -868,6 +868,8 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 	__finally575:
 #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 871 "VideoMetadata.c"
+		gboolean _tmp21_ = FALSE;
 #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_quick_time_atom_unref0 (test);
 #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -875,18 +877,18 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		g_clear_error (&_inner_error_);
 #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		return FALSE;
-#line 879 "VideoMetadata.c"
+		return _tmp21_;
+#line 881 "VideoMetadata.c"
 	}
 	{
-		QuickTimeAtom* _tmp21_ = NULL;
+		QuickTimeAtom* _tmp22_ = NULL;
 #line 107 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		_tmp21_ = test;
+		_tmp22_ = test;
 #line 107 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		quick_time_atom_close_file (_tmp21_, &_inner_error_);
+		quick_time_atom_close_file (_tmp22_, &_inner_error_);
 #line 107 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 889 "VideoMetadata.c"
+#line 891 "VideoMetadata.c"
 			goto __catch576_g_error;
 		}
 	}
@@ -894,25 +896,27 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 	__catch576_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp22_ = NULL;
-		const gchar* _tmp23_ = NULL;
+		GError* _tmp23_ = NULL;
+		const gchar* _tmp24_ = NULL;
 #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		e = _inner_error_;
 #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_inner_error_ = NULL;
 #line 109 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		_tmp22_ = e;
+		_tmp23_ = e;
 #line 109 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		_tmp23_ = _tmp22_->message;
+		_tmp24_ = _tmp23_->message;
 #line 109 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		g_debug ("VideoMetadata.vala:109: Error while closing Quicktime file: %s", _tmp23_);
+		g_debug ("VideoMetadata.vala:109: Error while closing Quicktime file: %s", _tmp24_);
 #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_g_error_free0 (e);
-#line 911 "VideoMetadata.c"
+#line 913 "VideoMetadata.c"
 	}
 	__finally576:
 #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 918 "VideoMetadata.c"
+		gboolean _tmp25_ = FALSE;
 #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_quick_time_atom_unref0 (test);
 #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -920,8 +924,8 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		g_clear_error (&_inner_error_);
 #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		return FALSE;
-#line 924 "VideoMetadata.c"
+		return _tmp25_;
+#line 928 "VideoMetadata.c"
 	}
 #line 111 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	result = ret;
@@ -929,7 +933,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 	_quick_time_atom_unref0 (test);
 #line 111 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 932 "VideoMetadata.c"
+#line 936 "VideoMetadata.c"
 }
 
 
@@ -939,8 +943,8 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 	GFile* _tmp0_ = NULL;
 	QuickTimeAtom* _tmp1_ = NULL;
 	time_t timestamp = 0;
-	time_t _tmp35_ = 0;
 	time_t _tmp37_ = 0;
+	time_t _tmp39_ = 0;
 	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);
@@ -952,7 +956,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 	test = _tmp1_;
 #line 116 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	timestamp = (time_t) 0;
-#line 955 "VideoMetadata.c"
+#line 959 "VideoMetadata.c"
 	{
 		QuickTimeAtom* _tmp2_ = NULL;
 		gboolean done = FALSE;
@@ -962,14 +966,14 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 		quick_time_atom_open_file (_tmp2_, &_inner_error_);
 #line 119 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 965 "VideoMetadata.c"
+#line 969 "VideoMetadata.c"
 			goto __catch577_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 972 "VideoMetadata.c"
+#line 976 "VideoMetadata.c"
 			gboolean _tmp3_ = FALSE;
 			QuickTimeAtom* _tmp4_ = NULL;
 			QuickTimeAtom* _tmp5_ = NULL;
@@ -985,7 +989,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 			if (!(!_tmp3_)) {
 #line 121 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				break;
-#line 988 "VideoMetadata.c"
+#line 992 "VideoMetadata.c"
 			}
 #line 123 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp4_ = test;
@@ -993,7 +997,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 			quick_time_atom_read_atom (_tmp4_, &_inner_error_);
 #line 123 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 996 "VideoMetadata.c"
+#line 1000 "VideoMetadata.c"
 				goto __catch577_g_error;
 			}
 #line 124 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1004,7 +1008,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 			if (_tmp6_) {
 #line 124 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				break;
-#line 1007 "VideoMetadata.c"
+#line 1011 "VideoMetadata.c"
 			}
 #line 125 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp7_ = test;
@@ -1018,7 +1022,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 			_g_free0 (_tmp9_);
 #line 125 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			if (_tmp10_) {
-#line 1021 "VideoMetadata.c"
+#line 1025 "VideoMetadata.c"
 				QuickTimeAtom* child = NULL;
 				QuickTimeAtom* _tmp11_ = NULL;
 				QuickTimeAtom* _tmp12_ = NULL;
@@ -1030,7 +1034,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 				child = _tmp12_;
 #line 127 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				while (TRUE) {
-#line 1033 "VideoMetadata.c"
+#line 1037 "VideoMetadata.c"
 					gboolean _tmp13_ = FALSE;
 					QuickTimeAtom* _tmp14_ = NULL;
 					gboolean _tmp15_ = FALSE;
@@ -1047,7 +1051,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 					if (!(!_tmp13_)) {
 #line 127 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						break;
-#line 1050 "VideoMetadata.c"
+#line 1054 "VideoMetadata.c"
 					}
 #line 129 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					_tmp14_ = child;
@@ -1057,7 +1061,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 129 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_quick_time_atom_unref0 (child);
-#line 1060 "VideoMetadata.c"
+#line 1064 "VideoMetadata.c"
 						goto __catch577_g_error;
 					}
 #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1068,7 +1072,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 					if (_tmp17_) {
 #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_tmp15_ = TRUE;
-#line 1071 "VideoMetadata.c"
+#line 1075 "VideoMetadata.c"
 					} else {
 						QuickTimeAtom* _tmp18_ = NULL;
 						guint64 _tmp19_ = 0ULL;
@@ -1078,7 +1082,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 						_tmp19_ = quick_time_atom_section_size_remaining (_tmp18_);
 #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_tmp15_ = ((guint64) 0) == _tmp19_;
-#line 1081 "VideoMetadata.c"
+#line 1085 "VideoMetadata.c"
 					}
 #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					if (_tmp15_) {
@@ -1086,7 +1090,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 						done = TRUE;
 #line 132 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						break;
-#line 1089 "VideoMetadata.c"
+#line 1093 "VideoMetadata.c"
 					}
 #line 135 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					_tmp20_ = child;
@@ -1100,7 +1104,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 					_g_free0 (_tmp22_);
 #line 135 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					if (_tmp23_) {
-#line 1103 "VideoMetadata.c"
+#line 1107 "VideoMetadata.c"
 						QuickTimeAtom* _tmp24_ = NULL;
 						guint32 _tmp25_ = 0U;
 						QuickTimeAtom* _tmp26_ = NULL;
@@ -1113,7 +1117,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 137 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 							_quick_time_atom_unref0 (child);
-#line 1116 "VideoMetadata.c"
+#line 1120 "VideoMetadata.c"
 							goto __catch577_g_error;
 						}
 #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1126,7 +1130,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 							_quick_time_atom_unref0 (child);
-#line 1129 "VideoMetadata.c"
+#line 1133 "VideoMetadata.c"
 							goto __catch577_g_error;
 						}
 #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1135,7 +1139,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 						done = TRUE;
 #line 141 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						break;
-#line 1138 "VideoMetadata.c"
+#line 1142 "VideoMetadata.c"
 					}
 #line 143 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					_tmp28_ = child;
@@ -1145,13 +1149,13 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 143 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_quick_time_atom_unref0 (child);
-#line 1148 "VideoMetadata.c"
+#line 1152 "VideoMetadata.c"
 						goto __catch577_g_error;
 					}
 				}
 #line 125 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				_quick_time_atom_unref0 (child);
-#line 1154 "VideoMetadata.c"
+#line 1158 "VideoMetadata.c"
 			}
 #line 146 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp29_ = test;
@@ -1159,7 +1163,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 			quick_time_atom_next_atom (_tmp29_, &_inner_error_);
 #line 146 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1162 "VideoMetadata.c"
+#line 1166 "VideoMetadata.c"
 				goto __catch577_g_error;
 			}
 		}
@@ -1182,11 +1186,13 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 		g_debug ("VideoMetadata.vala:149: Error while testing for QuickTime file: %s", _tmp31_);
 #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_g_error_free0 (e);
-#line 1185 "VideoMetadata.c"
+#line 1189 "VideoMetadata.c"
 	}
 	__finally577:
 #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1194 "VideoMetadata.c"
+		gulong _tmp32_ = 0UL;
 #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_quick_time_atom_unref0 (test);
 #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1194,18 +1200,18 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		g_clear_error (&_inner_error_);
 #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		return 0UL;
-#line 1198 "VideoMetadata.c"
+		return _tmp32_;
+#line 1204 "VideoMetadata.c"
 	}
 	{
-		QuickTimeAtom* _tmp32_ = NULL;
+		QuickTimeAtom* _tmp33_ = NULL;
 #line 153 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		_tmp32_ = test;
+		_tmp33_ = test;
 #line 153 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		quick_time_atom_close_file (_tmp32_, &_inner_error_);
+		quick_time_atom_close_file (_tmp33_, &_inner_error_);
 #line 153 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1208 "VideoMetadata.c"
+#line 1214 "VideoMetadata.c"
 			goto __catch578_g_error;
 		}
 	}
@@ -1213,25 +1219,27 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 	__catch578_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp33_ = NULL;
-		const gchar* _tmp34_ = NULL;
+		GError* _tmp34_ = NULL;
+		const gchar* _tmp35_ = NULL;
 #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		e = _inner_error_;
 #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_inner_error_ = NULL;
 #line 155 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		_tmp33_ = e;
+		_tmp34_ = e;
 #line 155 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		_tmp34_ = _tmp33_->message;
+		_tmp35_ = _tmp34_->message;
 #line 155 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		g_debug ("VideoMetadata.vala:155: Error while closing Quicktime file: %s", _tmp34_);
+		g_debug ("VideoMetadata.vala:155: Error while closing Quicktime file: %s", _tmp35_);
 #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_g_error_free0 (e);
-#line 1230 "VideoMetadata.c"
+#line 1236 "VideoMetadata.c"
 	}
 	__finally578:
 #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1241 "VideoMetadata.c"
+		gulong _tmp36_ = 0UL;
 #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_quick_time_atom_unref0 (test);
 #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1239,37 +1247,37 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		g_clear_error (&_inner_error_);
 #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		return 0UL;
-#line 1243 "VideoMetadata.c"
+		return _tmp36_;
+#line 1251 "VideoMetadata.c"
 	}
 #line 166 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-	_tmp35_ = timestamp;
+	_tmp37_ = timestamp;
 #line 166 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-	if (_tmp35_ < ((time_t) 0)) {
-#line 1249 "VideoMetadata.c"
-		time_t _tmp36_ = 0;
+	if (_tmp37_ < ((time_t) 0)) {
+#line 1257 "VideoMetadata.c"
+		time_t _tmp38_ = 0;
 #line 167 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		_tmp36_ = timestamp;
+		_tmp38_ = timestamp;
 #line 167 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		timestamp = _tmp36_ + QUICK_TIME_METADATA_LOADER_QUICKTIME_EPOCH_ADJUSTMENT;
-#line 1255 "VideoMetadata.c"
+		timestamp = _tmp38_ + QUICK_TIME_METADATA_LOADER_QUICKTIME_EPOCH_ADJUSTMENT;
+#line 1263 "VideoMetadata.c"
 	}
 #line 169 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-	_tmp37_ = timestamp;
+	_tmp39_ = timestamp;
 #line 169 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-	result = (gulong) _tmp37_;
+	result = (gulong) _tmp39_;
 #line 169 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_quick_time_atom_unref0 (test);
 #line 169 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 1265 "VideoMetadata.c"
+#line 1273 "VideoMetadata.c"
 }
 
 
 static void value_quick_time_metadata_loader_init (GValue* value) {
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	value->data[0].v_pointer = NULL;
-#line 1272 "VideoMetadata.c"
+#line 1280 "VideoMetadata.c"
 }
 
 
@@ -1278,7 +1286,7 @@ static void value_quick_time_metadata_loader_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		quick_time_metadata_loader_unref (value->data[0].v_pointer);
-#line 1281 "VideoMetadata.c"
+#line 1289 "VideoMetadata.c"
 	}
 }
 
@@ -1288,11 +1296,11 @@ static void value_quick_time_metadata_loader_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		dest_value->data[0].v_pointer = quick_time_metadata_loader_ref (src_value->data[0].v_pointer);
-#line 1291 "VideoMetadata.c"
+#line 1299 "VideoMetadata.c"
 	} else {
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1295 "VideoMetadata.c"
+#line 1303 "VideoMetadata.c"
 	}
 }
 
@@ -1300,37 +1308,37 @@ static void value_quick_time_metadata_loader_copy_value (const GValue* src_value
 static gpointer value_quick_time_metadata_loader_peek_pointer (const GValue* value) {
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 1303 "VideoMetadata.c"
+#line 1311 "VideoMetadata.c"
 }
 
 
 static gchar* value_quick_time_metadata_loader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (collect_values[0].v_pointer) {
-#line 1310 "VideoMetadata.c"
+#line 1318 "VideoMetadata.c"
 		QuickTimeMetadataLoader* object;
 		object = collect_values[0].v_pointer;
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1317 "VideoMetadata.c"
+#line 1325 "VideoMetadata.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 53 "/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 1321 "VideoMetadata.c"
+#line 1329 "VideoMetadata.c"
 		}
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = quick_time_metadata_loader_ref (object);
-#line 1325 "VideoMetadata.c"
+#line 1333 "VideoMetadata.c"
 	} else {
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 1329 "VideoMetadata.c"
+#line 1337 "VideoMetadata.c"
 	}
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return NULL;
-#line 1333 "VideoMetadata.c"
+#line 1341 "VideoMetadata.c"
 }
 
 
@@ -1341,25 +1349,25 @@ static gchar* value_quick_time_metadata_loader_lcopy_value (const GValue* value,
 	if (!object_p) {
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1344 "VideoMetadata.c"
+#line 1352 "VideoMetadata.c"
 	}
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (!value->data[0].v_pointer) {
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		*object_p = NULL;
-#line 1350 "VideoMetadata.c"
+#line 1358 "VideoMetadata.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1354 "VideoMetadata.c"
+#line 1362 "VideoMetadata.c"
 	} else {
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		*object_p = quick_time_metadata_loader_ref (value->data[0].v_pointer);
-#line 1358 "VideoMetadata.c"
+#line 1366 "VideoMetadata.c"
 	}
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return NULL;
-#line 1362 "VideoMetadata.c"
+#line 1370 "VideoMetadata.c"
 }
 
 
@@ -1373,7 +1381,7 @@ GParamSpec* param_spec_quick_time_metadata_loader (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return G_PARAM_SPEC (spec);
-#line 1376 "VideoMetadata.c"
+#line 1384 "VideoMetadata.c"
 }
 
 
@@ -1382,7 +1390,7 @@ gpointer value_get_quick_time_metadata_loader (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_QUICK_TIME_METADATA_LOADER), NULL);
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 1385 "VideoMetadata.c"
+#line 1393 "VideoMetadata.c"
 }
 
 
@@ -1402,17 +1410,17 @@ void value_set_quick_time_metadata_loader (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		quick_time_metadata_loader_ref (value->data[0].v_pointer);
-#line 1405 "VideoMetadata.c"
+#line 1413 "VideoMetadata.c"
 	} else {
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 1409 "VideoMetadata.c"
+#line 1417 "VideoMetadata.c"
 	}
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (old) {
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		quick_time_metadata_loader_unref (old);
-#line 1415 "VideoMetadata.c"
+#line 1423 "VideoMetadata.c"
 	}
 }
 
@@ -1431,17 +1439,17 @@ void value_take_quick_time_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 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = v_object;
-#line 1434 "VideoMetadata.c"
+#line 1442 "VideoMetadata.c"
 	} else {
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 1438 "VideoMetadata.c"
+#line 1446 "VideoMetadata.c"
 	}
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (old) {
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		quick_time_metadata_loader_unref (old);
-#line 1444 "VideoMetadata.c"
+#line 1452 "VideoMetadata.c"
 	}
 }
 
@@ -1453,7 +1461,7 @@ static void quick_time_metadata_loader_class_init (QuickTimeMetadataLoaderClass
 	((QuickTimeMetadataLoaderClass *) klass)->finalize = quick_time_metadata_loader_finalize;
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_type_class_add_private (klass, sizeof (QuickTimeMetadataLoaderPrivate));
-#line 1456 "VideoMetadata.c"
+#line 1464 "VideoMetadata.c"
 }
 
 
@@ -1464,7 +1472,7 @@ static void quick_time_metadata_loader_instance_init (QuickTimeMetadataLoader *
 	self->priv->file = NULL;
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self->ref_count = 1;
-#line 1467 "VideoMetadata.c"
+#line 1475 "VideoMetadata.c"
 }
 
 
@@ -1476,7 +1484,7 @@ static void quick_time_metadata_loader_finalize (QuickTimeMetadataLoader* obj) {
 	g_signal_handlers_destroy (self);
 #line 59 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_g_object_unref0 (self->priv->file);
-#line 1479 "VideoMetadata.c"
+#line 1487 "VideoMetadata.c"
 }
 
 
@@ -1501,7 +1509,7 @@ gpointer quick_time_metadata_loader_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return instance;
-#line 1504 "VideoMetadata.c"
+#line 1512 "VideoMetadata.c"
 }
 
 
@@ -1514,7 +1522,7 @@ void quick_time_metadata_loader_unref (gpointer instance) {
 		QUICK_TIME_METADATA_LOADER_GET_CLASS (self)->finalize (self);
 #line 53 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1517 "VideoMetadata.c"
+#line 1525 "VideoMetadata.c"
 	}
 }
 
@@ -1537,21 +1545,21 @@ QuickTimeAtom* quick_time_atom_construct (GType object_type, GFile* file) {
 	self->priv->file = _tmp1_;
 #line 181 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return self;
-#line 1540 "VideoMetadata.c"
+#line 1548 "VideoMetadata.c"
 }
 
 
 QuickTimeAtom* quick_time_atom_new (GFile* file) {
 #line 181 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return quick_time_atom_construct (TYPE_QUICK_TIME_ATOM, file);
-#line 1547 "VideoMetadata.c"
+#line 1555 "VideoMetadata.c"
 }
 
 
 static gpointer _quick_time_atom_ref0 (gpointer self) {
 #line 187 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return self ? quick_time_atom_ref (self) : NULL;
-#line 1554 "VideoMetadata.c"
+#line 1562 "VideoMetadata.c"
 }
 
 
@@ -1585,14 +1593,14 @@ static QuickTimeAtom* quick_time_atom_construct_with_input_stream (GType object_
 	self->priv->parent = _tmp3_;
 #line 185 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return self;
-#line 1588 "VideoMetadata.c"
+#line 1596 "VideoMetadata.c"
 }
 
 
 static QuickTimeAtom* quick_time_atom_new_with_input_stream (GDataInputStream* input, QuickTimeAtom* parent) {
 #line 185 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return quick_time_atom_construct_with_input_stream (TYPE_QUICK_TIME_ATOM, input, parent);
-#line 1595 "VideoMetadata.c"
+#line 1603 "VideoMetadata.c"
 }
 
 
@@ -1614,7 +1622,7 @@ void quick_time_atom_open_file (QuickTimeAtom* self, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 191 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return;
-#line 1617 "VideoMetadata.c"
+#line 1625 "VideoMetadata.c"
 	}
 #line 192 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp1_ = self->priv->file;
@@ -1628,7 +1636,7 @@ void quick_time_atom_open_file (QuickTimeAtom* self, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 192 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return;
-#line 1631 "VideoMetadata.c"
+#line 1639 "VideoMetadata.c"
 	}
 #line 192 "/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));
@@ -1652,7 +1660,7 @@ void quick_time_atom_open_file (QuickTimeAtom* self, GError** error) {
 	self->priv->section_name = _tmp5_;
 #line 190 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_g_object_unref0 (_tmp0_);
-#line 1655 "VideoMetadata.c"
+#line 1663 "VideoMetadata.c"
 }
 
 
@@ -1665,7 +1673,7 @@ void quick_time_atom_close_file (QuickTimeAtom* self, GError** error) {
 	_tmp0_ = self->priv->input;
 #line 200 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (NULL != _tmp0_) {
-#line 1668 "VideoMetadata.c"
+#line 1676 "VideoMetadata.c"
 		GDataInputStream* _tmp1_ = NULL;
 #line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp1_ = self->priv->input;
@@ -1677,13 +1685,13 @@ void quick_time_atom_close_file (QuickTimeAtom* self, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			return;
-#line 1680 "VideoMetadata.c"
+#line 1688 "VideoMetadata.c"
 		}
 #line 202 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_g_object_unref0 (self->priv->input);
 #line 202 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		self->priv->input = NULL;
-#line 1686 "VideoMetadata.c"
+#line 1694 "VideoMetadata.c"
 	}
 }
 
@@ -1704,7 +1712,7 @@ static void quick_time_atom_advance_section_offset (QuickTimeAtom* self, guint64
 	_tmp2_ = self->priv->parent;
 #line 208 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (NULL != _tmp2_) {
-#line 1707 "VideoMetadata.c"
+#line 1715 "VideoMetadata.c"
 		QuickTimeAtom* _tmp3_ = NULL;
 		guint64 _tmp4_ = 0ULL;
 #line 209 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1713,7 +1721,7 @@ static void quick_time_atom_advance_section_offset (QuickTimeAtom* self, guint64
 		_tmp4_ = amount;
 #line 209 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		quick_time_atom_advance_section_offset (_tmp3_, _tmp4_);
-#line 1716 "VideoMetadata.c"
+#line 1724 "VideoMetadata.c"
 	}
 }
 
@@ -1732,7 +1740,7 @@ QuickTimeAtom* quick_time_atom_get_first_child_atom (QuickTimeAtom* self) {
 	result = _tmp1_;
 #line 219 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 1735 "VideoMetadata.c"
+#line 1743 "VideoMetadata.c"
 }
 
 
@@ -1754,17 +1762,19 @@ guchar quick_time_atom_read_byte (QuickTimeAtom* self, GError** error) {
 	_tmp0_ = _tmp2_;
 #line 224 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1765 "VideoMetadata.c"
+		guchar _tmp3_ = '\0';
 #line 224 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		g_propagate_error (error, _inner_error_);
 #line 224 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		return '\0';
-#line 1761 "VideoMetadata.c"
+		return _tmp3_;
+#line 1771 "VideoMetadata.c"
 	}
 #line 224 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	result = (guchar) _tmp0_;
 #line 224 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 1767 "VideoMetadata.c"
+#line 1777 "VideoMetadata.c"
 }
 
 
@@ -1786,17 +1796,19 @@ guint32 quick_time_atom_read_uint32 (QuickTimeAtom* self, GError** error) {
 	_tmp0_ = _tmp2_;
 #line 229 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1799 "VideoMetadata.c"
+		guint32 _tmp3_ = 0U;
 #line 229 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		g_propagate_error (error, _inner_error_);
 #line 229 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		return 0U;
-#line 1793 "VideoMetadata.c"
+		return _tmp3_;
+#line 1805 "VideoMetadata.c"
 	}
 #line 229 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	result = _tmp0_;
 #line 229 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 1799 "VideoMetadata.c"
+#line 1811 "VideoMetadata.c"
 }
 
 
@@ -1818,17 +1830,19 @@ guint64 quick_time_atom_read_uint64 (QuickTimeAtom* self, GError** error) {
 	_tmp0_ = _tmp2_;
 #line 234 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1833 "VideoMetadata.c"
+		guint64 _tmp3_ = 0ULL;
 #line 234 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		g_propagate_error (error, _inner_error_);
 #line 234 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		return 0ULL;
-#line 1825 "VideoMetadata.c"
+		return _tmp3_;
+#line 1839 "VideoMetadata.c"
 	}
 #line 234 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	result = _tmp0_;
 #line 234 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 1831 "VideoMetadata.c"
+#line 1845 "VideoMetadata.c"
 }
 
 
@@ -1846,7 +1860,7 @@ static gchar string_get (const gchar* self, glong index) {
 	result = _tmp1_;
 #line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 1849 "VideoMetadata.c"
+#line 1863 "VideoMetadata.c"
 }
 
 
@@ -1887,7 +1901,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 239 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return;
-#line 1890 "VideoMetadata.c"
+#line 1904 "VideoMetadata.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self->priv->section_size = (guint64) _tmp0_;
@@ -1907,7 +1921,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
 		_g_string_free0 (sb);
 #line 243 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return;
-#line 1910 "VideoMetadata.c"
+#line 1924 "VideoMetadata.c"
 	}
 #line 243 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp5_ = sb;
@@ -1925,7 +1939,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
 		_g_string_free0 (sb);
 #line 244 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return;
-#line 1928 "VideoMetadata.c"
+#line 1942 "VideoMetadata.c"
 	}
 #line 244 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp8_ = sb;
@@ -1943,7 +1957,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
 		_g_string_free0 (sb);
 #line 245 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return;
-#line 1946 "VideoMetadata.c"
+#line 1960 "VideoMetadata.c"
 	}
 #line 245 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp11_ = sb;
@@ -1961,7 +1975,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
 		_g_string_free0 (sb);
 #line 246 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return;
-#line 1964 "VideoMetadata.c"
+#line 1978 "VideoMetadata.c"
 	}
 #line 246 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp14_ = sb;
@@ -1985,7 +1999,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
 	_tmp20_ = _tmp19_;
 #line 250 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (_tmp20_ != 4) {
-#line 1988 "VideoMetadata.c"
+#line 2002 "VideoMetadata.c"
 		GFile* _tmp21_ = NULL;
 		gchar* _tmp22_ = NULL;
 		gchar* _tmp23_ = NULL;
@@ -2011,20 +2025,20 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
 		_g_string_free0 (sb);
 #line 251 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return;
-#line 2014 "VideoMetadata.c"
+#line 2028 "VideoMetadata.c"
 	}
 	{
 		gint i = 0;
 #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		i = 0;
-#line 2020 "VideoMetadata.c"
+#line 2034 "VideoMetadata.c"
 		{
 			gboolean _tmp26_ = FALSE;
 #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp26_ = TRUE;
 #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			while (TRUE) {
-#line 2027 "VideoMetadata.c"
+#line 2041 "VideoMetadata.c"
 				gint _tmp28_ = 0;
 				const gchar* _tmp29_ = NULL;
 				gint _tmp30_ = 0;
@@ -2035,13 +2049,13 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
 				gboolean _tmp35_ = FALSE;
 #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				if (!_tmp26_) {
-#line 2038 "VideoMetadata.c"
+#line 2052 "VideoMetadata.c"
 					gint _tmp27_ = 0;
 #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					_tmp27_ = i;
 #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					i = _tmp27_ + 1;
-#line 2044 "VideoMetadata.c"
+#line 2058 "VideoMetadata.c"
 				}
 #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				_tmp26_ = FALSE;
@@ -2057,7 +2071,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
 				if (!(_tmp28_ < _tmp31_)) {
 #line 254 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					break;
-#line 2060 "VideoMetadata.c"
+#line 2074 "VideoMetadata.c"
 				}
 #line 255 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				_tmp32_ = self->priv->section_name;
@@ -2069,7 +2083,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
 				_tmp35_ = g_ascii_isprint (_tmp34_);
 #line 255 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				if (!_tmp35_) {
-#line 2072 "VideoMetadata.c"
+#line 2086 "VideoMetadata.c"
 					GFile* _tmp36_ = NULL;
 					gchar* _tmp37_ = NULL;
 					gchar* _tmp38_ = NULL;
@@ -2095,7 +2109,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
 					_g_string_free0 (sb);
 #line 256 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					return;
-#line 2098 "VideoMetadata.c"
+#line 2112 "VideoMetadata.c"
 				}
 			}
 		}
@@ -2104,7 +2118,7 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
 	_tmp41_ = self->priv->section_size;
 #line 260 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (((guint64) 1) == _tmp41_) {
-#line 2107 "VideoMetadata.c"
+#line 2121 "VideoMetadata.c"
 		guint64 _tmp42_ = 0ULL;
 		guint64 _tmp43_ = 0ULL;
 #line 263 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2119,15 +2133,15 @@ void quick_time_atom_read_atom (QuickTimeAtom* self, GError** error) {
 			_g_string_free0 (sb);
 #line 263 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			return;
-#line 2122 "VideoMetadata.c"
+#line 2136 "VideoMetadata.c"
 		}
 #line 263 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		self->priv->section_size = _tmp42_;
-#line 2126 "VideoMetadata.c"
+#line 2140 "VideoMetadata.c"
 	}
 #line 237 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_g_string_free0 (sb);
-#line 2130 "VideoMetadata.c"
+#line 2144 "VideoMetadata.c"
 }
 
 
@@ -2149,7 +2163,7 @@ static void quick_time_atom_skip (QuickTimeAtom* self, guint64 skip_amount, GErr
 		g_propagate_error (error, _inner_error_);
 #line 268 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return;
-#line 2152 "VideoMetadata.c"
+#line 2166 "VideoMetadata.c"
 	}
 }
 
@@ -2176,7 +2190,7 @@ guint64 quick_time_atom_section_size_remaining (QuickTimeAtom* self) {
 	result = _tmp2_ - _tmp3_;
 #line 273 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 2179 "VideoMetadata.c"
+#line 2193 "VideoMetadata.c"
 }
 
 
@@ -2195,13 +2209,13 @@ void quick_time_atom_next_atom (QuickTimeAtom* self, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 277 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return;
-#line 2198 "VideoMetadata.c"
+#line 2212 "VideoMetadata.c"
 	}
 #line 278 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self->priv->section_size = (guint64) 0;
 #line 279 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self->priv->section_offset = (guint64) 0;
-#line 2204 "VideoMetadata.c"
+#line 2218 "VideoMetadata.c"
 }
 
 
@@ -2219,7 +2233,7 @@ gchar* quick_time_atom_get_current_atom_name (QuickTimeAtom* self) {
 	result = _tmp1_;
 #line 283 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 2222 "VideoMetadata.c"
+#line 2236 "VideoMetadata.c"
 }
 
 
@@ -2234,14 +2248,14 @@ gboolean quick_time_atom_is_last_atom (QuickTimeAtom* self) {
 	result = ((guint64) 0) == _tmp0_;
 #line 287 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 2237 "VideoMetadata.c"
+#line 2251 "VideoMetadata.c"
 }
 
 
 static void value_quick_time_atom_init (GValue* value) {
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	value->data[0].v_pointer = NULL;
-#line 2244 "VideoMetadata.c"
+#line 2258 "VideoMetadata.c"
 }
 
 
@@ -2250,7 +2264,7 @@ static void value_quick_time_atom_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		quick_time_atom_unref (value->data[0].v_pointer);
-#line 2253 "VideoMetadata.c"
+#line 2267 "VideoMetadata.c"
 	}
 }
 
@@ -2260,11 +2274,11 @@ static void value_quick_time_atom_copy_value (const GValue* src_value, GValue* d
 	if (src_value->data[0].v_pointer) {
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		dest_value->data[0].v_pointer = quick_time_atom_ref (src_value->data[0].v_pointer);
-#line 2263 "VideoMetadata.c"
+#line 2277 "VideoMetadata.c"
 	} else {
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2267 "VideoMetadata.c"
+#line 2281 "VideoMetadata.c"
 	}
 }
 
@@ -2272,37 +2286,37 @@ static void value_quick_time_atom_copy_value (const GValue* src_value, GValue* d
 static gpointer value_quick_time_atom_peek_pointer (const GValue* value) {
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 2275 "VideoMetadata.c"
+#line 2289 "VideoMetadata.c"
 }
 
 
 static gchar* value_quick_time_atom_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (collect_values[0].v_pointer) {
-#line 2282 "VideoMetadata.c"
+#line 2296 "VideoMetadata.c"
 		QuickTimeAtom* object;
 		object = collect_values[0].v_pointer;
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2289 "VideoMetadata.c"
+#line 2303 "VideoMetadata.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 173 "/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 2293 "VideoMetadata.c"
+#line 2307 "VideoMetadata.c"
 		}
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = quick_time_atom_ref (object);
-#line 2297 "VideoMetadata.c"
+#line 2311 "VideoMetadata.c"
 	} else {
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 2301 "VideoMetadata.c"
+#line 2315 "VideoMetadata.c"
 	}
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return NULL;
-#line 2305 "VideoMetadata.c"
+#line 2319 "VideoMetadata.c"
 }
 
 
@@ -2313,25 +2327,25 @@ static gchar* value_quick_time_atom_lcopy_value (const GValue* value, guint n_co
 	if (!object_p) {
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2316 "VideoMetadata.c"
+#line 2330 "VideoMetadata.c"
 	}
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (!value->data[0].v_pointer) {
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		*object_p = NULL;
-#line 2322 "VideoMetadata.c"
+#line 2336 "VideoMetadata.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2326 "VideoMetadata.c"
+#line 2340 "VideoMetadata.c"
 	} else {
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		*object_p = quick_time_atom_ref (value->data[0].v_pointer);
-#line 2330 "VideoMetadata.c"
+#line 2344 "VideoMetadata.c"
 	}
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return NULL;
-#line 2334 "VideoMetadata.c"
+#line 2348 "VideoMetadata.c"
 }
 
 
@@ -2345,7 +2359,7 @@ GParamSpec* param_spec_quick_time_atom (const gchar* name, const gchar* nick, co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return G_PARAM_SPEC (spec);
-#line 2348 "VideoMetadata.c"
+#line 2362 "VideoMetadata.c"
 }
 
 
@@ -2354,7 +2368,7 @@ gpointer value_get_quick_time_atom (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_QUICK_TIME_ATOM), NULL);
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 2357 "VideoMetadata.c"
+#line 2371 "VideoMetadata.c"
 }
 
 
@@ -2374,17 +2388,17 @@ void value_set_quick_time_atom (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		quick_time_atom_ref (value->data[0].v_pointer);
-#line 2377 "VideoMetadata.c"
+#line 2391 "VideoMetadata.c"
 	} else {
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 2381 "VideoMetadata.c"
+#line 2395 "VideoMetadata.c"
 	}
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (old) {
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		quick_time_atom_unref (old);
-#line 2387 "VideoMetadata.c"
+#line 2401 "VideoMetadata.c"
 	}
 }
 
@@ -2403,17 +2417,17 @@ void value_take_quick_time_atom (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = v_object;
-#line 2406 "VideoMetadata.c"
+#line 2420 "VideoMetadata.c"
 	} else {
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 2410 "VideoMetadata.c"
+#line 2424 "VideoMetadata.c"
 	}
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (old) {
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		quick_time_atom_unref (old);
-#line 2416 "VideoMetadata.c"
+#line 2430 "VideoMetadata.c"
 	}
 }
 
@@ -2425,7 +2439,7 @@ static void quick_time_atom_class_init (QuickTimeAtomClass * klass) {
 	((QuickTimeAtomClass *) klass)->finalize = quick_time_atom_finalize;
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	g_type_class_add_private (klass, sizeof (QuickTimeAtomPrivate));
-#line 2428 "VideoMetadata.c"
+#line 2442 "VideoMetadata.c"
 }
 
 
@@ -2449,7 +2463,7 @@ static void quick_time_atom_instance_init (QuickTimeAtom * self) {
 	self->priv->parent = NULL;
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self->ref_count = 1;
-#line 2452 "VideoMetadata.c"
+#line 2466 "VideoMetadata.c"
 }
 
 
@@ -2467,7 +2481,7 @@ static void quick_time_atom_finalize (QuickTimeAtom* obj) {
 	_g_object_unref0 (self->priv->input);
 #line 179 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_quick_time_atom_unref0 (self->priv->parent);
-#line 2470 "VideoMetadata.c"
+#line 2484 "VideoMetadata.c"
 }
 
 
@@ -2492,7 +2506,7 @@ gpointer quick_time_atom_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return instance;
-#line 2495 "VideoMetadata.c"
+#line 2509 "VideoMetadata.c"
 }
 
 
@@ -2505,7 +2519,7 @@ void quick_time_atom_unref (gpointer instance) {
 		QUICK_TIME_ATOM_GET_CLASS (self)->finalize (self);
 #line 173 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2508 "VideoMetadata.c"
+#line 2522 "VideoMetadata.c"
 	}
 }
 
@@ -2528,14 +2542,14 @@ AVIMetadataLoader* avi_metadata_loader_construct (GType object_type, GFile* file
 	self->priv->file = _tmp1_;
 #line 305 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return self;
-#line 2531 "VideoMetadata.c"
+#line 2545 "VideoMetadata.c"
 }
 
 
 AVIMetadataLoader* avi_metadata_loader_new (GFile* file) {
 #line 305 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return avi_metadata_loader_construct (TYPE_AVI_METADATA_LOADER, file);
-#line 2538 "VideoMetadata.c"
+#line 2552 "VideoMetadata.c"
 }
 
 
@@ -2553,7 +2567,7 @@ MetadataDateTime* avi_metadata_loader_get_creation_date_time (AVIMetadataLoader*
 	result = _tmp1_;
 #line 310 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 2556 "VideoMetadata.c"
+#line 2570 "VideoMetadata.c"
 }
 
 
@@ -2565,7 +2579,7 @@ gchar* avi_metadata_loader_get_title (AVIMetadataLoader* self) {
 	result = NULL;
 #line 315 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 2568 "VideoMetadata.c"
+#line 2582 "VideoMetadata.c"
 }
 
 
@@ -2586,7 +2600,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 	chunk = _tmp1_;
 #line 321 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	ret = FALSE;
-#line 2589 "VideoMetadata.c"
+#line 2603 "VideoMetadata.c"
 	{
 		AVIChunk* _tmp2_ = NULL;
 		AVIChunk* _tmp3_ = NULL;
@@ -2601,7 +2615,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 		avi_chunk_open_file (_tmp2_, &_inner_error_);
 #line 323 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2604 "VideoMetadata.c"
+#line 2618 "VideoMetadata.c"
 			goto __catch579_g_error;
 		}
 #line 324 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2610,7 +2624,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 		avi_chunk_read_chunk (_tmp3_, &_inner_error_);
 #line 324 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2613 "VideoMetadata.c"
+#line 2627 "VideoMetadata.c"
 			goto __catch579_g_error;
 		}
 #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2625,7 +2639,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 		_g_free0 (_tmp7_);
 #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (_tmp8_) {
-#line 2628 "VideoMetadata.c"
+#line 2642 "VideoMetadata.c"
 			gchar* _tmp9_ = NULL;
 			AVIChunk* _tmp10_ = NULL;
 			gchar* _tmp11_ = NULL;
@@ -2639,7 +2653,7 @@ 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 2642 "VideoMetadata.c"
+#line 2656 "VideoMetadata.c"
 				goto __catch579_g_error;
 			}
 #line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2654,17 +2668,17 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 			_g_free0 (_tmp13_);
 #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_g_free0 (_tmp9_);
-#line 2657 "VideoMetadata.c"
+#line 2671 "VideoMetadata.c"
 		} else {
 #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp4_ = FALSE;
-#line 2661 "VideoMetadata.c"
+#line 2675 "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 2667 "VideoMetadata.c"
+#line 2681 "VideoMetadata.c"
 		}
 	}
 	goto __finally579;
@@ -2685,11 +2699,13 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 		g_debug ("VideoMetadata.vala:331: Error while testing for AVI file: %s", _tmp15_);
 #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_g_error_free0 (e);
-#line 2688 "VideoMetadata.c"
+#line 2702 "VideoMetadata.c"
 	}
 	__finally579:
 #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 2707 "VideoMetadata.c"
+		gboolean _tmp16_ = FALSE;
 #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_avi_chunk_unref0 (chunk);
 #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2697,18 +2713,18 @@ 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 FALSE;
-#line 2701 "VideoMetadata.c"
+		return _tmp16_;
+#line 2717 "VideoMetadata.c"
 	}
 	{
-		AVIChunk* _tmp16_ = NULL;
+		AVIChunk* _tmp17_ = NULL;
 #line 335 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		_tmp16_ = chunk;
+		_tmp17_ = chunk;
 #line 335 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		avi_chunk_close_file (_tmp16_, &_inner_error_);
+		avi_chunk_close_file (_tmp17_, &_inner_error_);
 #line 335 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2711 "VideoMetadata.c"
+#line 2727 "VideoMetadata.c"
 			goto __catch580_g_error;
 		}
 	}
@@ -2716,25 +2732,27 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 	__catch580_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp17_ = NULL;
-		const gchar* _tmp18_ = NULL;
+		GError* _tmp18_ = NULL;
+		const gchar* _tmp19_ = NULL;
 #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"
-		_tmp17_ = e;
+		_tmp18_ = e;
 #line 337 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		_tmp18_ = _tmp17_->message;
+		_tmp19_ = _tmp18_->message;
 #line 337 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		g_debug ("VideoMetadata.vala:337: Error while closing AVI file: %s", _tmp18_);
+		g_debug ("VideoMetadata.vala:337: Error while closing AVI file: %s", _tmp19_);
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_g_error_free0 (e);
-#line 2733 "VideoMetadata.c"
+#line 2749 "VideoMetadata.c"
 	}
 	__finally580:
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 2754 "VideoMetadata.c"
+		gboolean _tmp20_ = FALSE;
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_avi_chunk_unref0 (chunk);
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2742,8 +2760,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 FALSE;
-#line 2746 "VideoMetadata.c"
+		return _tmp20_;
+#line 2764 "VideoMetadata.c"
 	}
 #line 339 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	result = ret;
@@ -2751,7 +2769,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 	_avi_chunk_unref0 (chunk);
 #line 339 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 2754 "VideoMetadata.c"
+#line 2772 "VideoMetadata.c"
 }
 
 
@@ -2769,7 +2787,7 @@ 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 2772 "VideoMetadata.c"
+#line 2790 "VideoMetadata.c"
 		AVIChunk* _tmp0_ = NULL;
 		guint64 _tmp1_ = 0ULL;
 		guint16 tag = 0U;
@@ -2789,7 +2807,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 2792 "VideoMetadata.c"
+#line 2810 "VideoMetadata.c"
 		}
 #line 346 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp2_ = chunk;
@@ -2803,7 +2821,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 2806 "VideoMetadata.c"
+#line 2824 "VideoMetadata.c"
 		}
 #line 347 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp4_ = chunk;
@@ -2817,7 +2835,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 2820 "VideoMetadata.c"
+#line 2838 "VideoMetadata.c"
 		}
 #line 348 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp6_ = tag;
@@ -2827,7 +2845,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 2830 "VideoMetadata.c"
+#line 2848 "VideoMetadata.c"
 		}
 #line 352 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp7_ = chunk;
@@ -2841,14 +2859,14 @@ 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 2844 "VideoMetadata.c"
+#line 2862 "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 2851 "VideoMetadata.c"
+#line 2869 "VideoMetadata.c"
 		GString* sb = NULL;
 		GString* _tmp10_ = NULL;
 		GString* _tmp18_ = NULL;
@@ -2858,19 +2876,19 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self,
 		_tmp10_ = g_string_new ("");
 #line 357 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		sb = _tmp10_;
-#line 2861 "VideoMetadata.c"
+#line 2879 "VideoMetadata.c"
 		{
 			gint i = 0;
 #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			i = 0;
-#line 2866 "VideoMetadata.c"
+#line 2884 "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 2873 "VideoMetadata.c"
+#line 2891 "VideoMetadata.c"
 					gint _tmp13_ = 0;
 					guchar _tmp14_ = '\0';
 					AVIChunk* _tmp15_ = NULL;
@@ -2878,13 +2896,13 @@ static gchar* avi_metadata_loader_read_nikon_nctg_tag (AVIMetadataLoader* self,
 					GString* _tmp17_ = NULL;
 #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					if (!_tmp11_) {
-#line 2881 "VideoMetadata.c"
+#line 2899 "VideoMetadata.c"
 						gint _tmp12_ = 0;
 #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_tmp12_ = i;
 #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						i = _tmp12_ + 1;
-#line 2887 "VideoMetadata.c"
+#line 2905 "VideoMetadata.c"
 					}
 #line 358 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					_tmp11_ = FALSE;
@@ -2894,7 +2912,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 2897 "VideoMetadata.c"
+#line 2915 "VideoMetadata.c"
 					}
 #line 359 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					_tmp15_ = chunk;
@@ -2910,13 +2928,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 2913 "VideoMetadata.c"
+#line 2931 "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 2919 "VideoMetadata.c"
+#line 2937 "VideoMetadata.c"
 				}
 			}
 		}
@@ -2932,7 +2950,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 2935 "VideoMetadata.c"
+#line 2953 "VideoMetadata.c"
 	}
 #line 363 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp21_ = g_strdup ("");
@@ -2940,7 +2958,7 @@ 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 2943 "VideoMetadata.c"
+#line 2961 "VideoMetadata.c"
 }
 
 
@@ -2963,7 +2981,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 2966 "VideoMetadata.c"
+#line 2984 "VideoMetadata.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -2971,7 +2989,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 2974 "VideoMetadata.c"
+#line 2992 "VideoMetadata.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -2983,7 +3001,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 2986 "VideoMetadata.c"
+#line 3004 "VideoMetadata.c"
 	}
 }
 
@@ -3007,21 +3025,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 3010 "VideoMetadata.c"
+#line 3028 "VideoMetadata.c"
 		glong _tmp2_ = 0L;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 3016 "VideoMetadata.c"
+#line 3034 "VideoMetadata.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 3020 "VideoMetadata.c"
+#line 3038 "VideoMetadata.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 3024 "VideoMetadata.c"
+#line 3042 "VideoMetadata.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -3033,7 +3051,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 3036 "VideoMetadata.c"
+#line 3054 "VideoMetadata.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -3043,13 +3061,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 3046 "VideoMetadata.c"
+#line 3064 "VideoMetadata.c"
 	}
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 3052 "VideoMetadata.c"
+#line 3070 "VideoMetadata.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -3063,7 +3081,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 3066 "VideoMetadata.c"
+#line 3084 "VideoMetadata.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -3073,13 +3091,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 3076 "VideoMetadata.c"
+#line 3094 "VideoMetadata.c"
 	}
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 3082 "VideoMetadata.c"
+#line 3100 "VideoMetadata.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3088,7 +3106,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 3091 "VideoMetadata.c"
+#line 3109 "VideoMetadata.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -3108,7 +3126,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 3111 "VideoMetadata.c"
+#line 3129 "VideoMetadata.c"
 }
 
 
@@ -3146,7 +3164,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 3149 "VideoMetadata.c"
+#line 3167 "VideoMetadata.c"
 	}
 #line 370 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp1_ = chunk;
@@ -3158,7 +3176,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 3161 "VideoMetadata.c"
+#line 3179 "VideoMetadata.c"
 	}
 #line 372 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	colons = 0;
@@ -3170,7 +3188,7 @@ 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 3173 "VideoMetadata.c"
+#line 3191 "VideoMetadata.c"
 		gboolean _tmp3_ = FALSE;
 		gint _tmp4_ = 0;
 		guchar _tmp6_ = '\0';
@@ -3187,23 +3205,23 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A
 		_tmp4_ = colons;
 #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (_tmp4_ <= 4) {
-#line 3190 "VideoMetadata.c"
+#line 3208 "VideoMetadata.c"
 			gint _tmp5_ = 0;
 #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 3196 "VideoMetadata.c"
+#line 3214 "VideoMetadata.c"
 		} else {
 #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp3_ = FALSE;
-#line 3200 "VideoMetadata.c"
+#line 3218 "VideoMetadata.c"
 		}
 #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (!_tmp3_) {
 #line 376 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			break;
-#line 3206 "VideoMetadata.c"
+#line 3224 "VideoMetadata.c"
 		}
 #line 377 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp7_ = chunk;
@@ -3219,7 +3237,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 3222 "VideoMetadata.c"
+#line 3240 "VideoMetadata.c"
 		}
 #line 377 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		c = (gchar) _tmp6_;
@@ -3227,25 +3245,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 3230 "VideoMetadata.c"
+#line 3248 "VideoMetadata.c"
 			gint _tmp10_ = 0;
 #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 3236 "VideoMetadata.c"
+#line 3254 "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 3242 "VideoMetadata.c"
+#line 3260 "VideoMetadata.c"
 			gint _tmp12_ = 0;
 #line 382 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp12_ = colons;
 #line 382 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			colons = _tmp12_ + 1;
-#line 3248 "VideoMetadata.c"
+#line 3266 "VideoMetadata.c"
 		}
 #line 384 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp13_ = c;
@@ -3253,7 +3271,7 @@ 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 3256 "VideoMetadata.c"
+#line 3274 "VideoMetadata.c"
 			GString* _tmp15_ = NULL;
 			gchar _tmp16_ = '\0';
 #line 385 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3262,7 +3280,7 @@ static gchar* avi_metadata_loader_read_fuji_strd_tag (AVIMetadataLoader* self, A
 			_tmp16_ = c;
 #line 385 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			g_string_append_c (_tmp15_, _tmp16_);
-#line 3265 "VideoMetadata.c"
+#line 3283 "VideoMetadata.c"
 		}
 #line 387 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp17_ = sb;
@@ -3270,7 +3288,7 @@ 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 3273 "VideoMetadata.c"
+#line 3291 "VideoMetadata.c"
 			gchar* _tmp19_ = NULL;
 #line 388 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp19_ = g_strdup ("");
@@ -3280,7 +3298,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 3283 "VideoMetadata.c"
+#line 3301 "VideoMetadata.c"
 		}
 	}
 #line 392 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -3293,7 +3311,7 @@ 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 3296 "VideoMetadata.c"
+#line 3314 "VideoMetadata.c"
 		gchar* _tmp24_ = NULL;
 #line 393 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp24_ = g_strdup ("");
@@ -3303,7 +3321,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 3306 "VideoMetadata.c"
+#line 3324 "VideoMetadata.c"
 	}
 #line 396 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp25_ = sb;
@@ -3325,7 +3343,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 3328 "VideoMetadata.c"
+#line 3346 "VideoMetadata.c"
 }
 
 
@@ -3338,7 +3356,7 @@ 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 3341 "VideoMetadata.c"
+#line 3359 "VideoMetadata.c"
 		AVIChunk* _tmp0_ = NULL;
 		gchar* name = NULL;
 		AVIChunk* _tmp1_ = NULL;
@@ -3358,7 +3376,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 3361 "VideoMetadata.c"
+#line 3379 "VideoMetadata.c"
 		}
 #line 403 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp1_ = chunk;
@@ -3370,7 +3388,7 @@ 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 3373 "VideoMetadata.c"
+#line 3391 "VideoMetadata.c"
 			gchar* _tmp4_ = NULL;
 			AVIChunk* _tmp5_ = NULL;
 			gchar* _tmp6_ = NULL;
@@ -3389,7 +3407,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 3392 "VideoMetadata.c"
+#line 3410 "VideoMetadata.c"
 			}
 #line 405 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp7_ = _tmp4_;
@@ -3403,14 +3421,14 @@ 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 3406 "VideoMetadata.c"
+#line 3424 "VideoMetadata.c"
 		} else {
 			const gchar* _tmp8_ = NULL;
 #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 3413 "VideoMetadata.c"
+#line 3431 "VideoMetadata.c"
 				gchar* _tmp9_ = NULL;
 				AVIChunk* _tmp10_ = NULL;
 				gchar* _tmp11_ = NULL;
@@ -3429,7 +3447,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 3432 "VideoMetadata.c"
+#line 3450 "VideoMetadata.c"
 				}
 #line 407 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				_tmp12_ = _tmp9_;
@@ -3443,14 +3461,14 @@ 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 3446 "VideoMetadata.c"
+#line 3464 "VideoMetadata.c"
 			} else {
 				const gchar* _tmp13_ = NULL;
 #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 3453 "VideoMetadata.c"
+#line 3471 "VideoMetadata.c"
 					gchar* _tmp14_ = NULL;
 					AVIChunk* _tmp15_ = NULL;
 					gchar* _tmp16_ = NULL;
@@ -3469,7 +3487,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 3472 "VideoMetadata.c"
+#line 3490 "VideoMetadata.c"
 					}
 #line 409 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					_tmp17_ = _tmp14_;
@@ -3483,7 +3501,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 3486 "VideoMetadata.c"
+#line 3504 "VideoMetadata.c"
 				}
 			}
 		}
@@ -3491,7 +3509,7 @@ 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 3494 "VideoMetadata.c"
+#line 3512 "VideoMetadata.c"
 			AVIChunk* _tmp19_ = NULL;
 			gchar* _tmp20_ = NULL;
 			gchar* _tmp21_ = NULL;
@@ -3518,7 +3536,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 3521 "VideoMetadata.c"
+#line 3539 "VideoMetadata.c"
 			}
 #line 414 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp22_ = chunk;
@@ -3542,7 +3560,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 3545 "VideoMetadata.c"
+#line 3563 "VideoMetadata.c"
 			}
 #line 415 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp27_ = _result_;
@@ -3554,11 +3572,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 3557 "VideoMetadata.c"
+#line 3575 "VideoMetadata.c"
 			}
 #line 412 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_g_free0 (_result_);
-#line 3561 "VideoMetadata.c"
+#line 3579 "VideoMetadata.c"
 		}
 #line 420 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp28_ = chunk;
@@ -3570,7 +3588,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 3573 "VideoMetadata.c"
+#line 3591 "VideoMetadata.c"
 		}
 #line 423 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp30_ = chunk;
@@ -3584,17 +3602,17 @@ 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 3587 "VideoMetadata.c"
+#line 3605 "VideoMetadata.c"
 		}
 #line 401 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_g_free0 (name);
-#line 3591 "VideoMetadata.c"
+#line 3609 "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 3597 "VideoMetadata.c"
+#line 3615 "VideoMetadata.c"
 }
 
 
@@ -3641,7 +3659,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 3644 "VideoMetadata.c"
+#line 3662 "VideoMetadata.c"
 	}
 #line 437 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	memset (&date, 0, sizeof (GDate));
@@ -3655,7 +3673,7 @@ 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 3658 "VideoMetadata.c"
+#line 3676 "VideoMetadata.c"
 		gchar* tmp = NULL;
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
@@ -3698,7 +3716,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 3701 "VideoMetadata.c"
+#line 3719 "VideoMetadata.c"
 		}
 #line 454 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp12_ = day;
@@ -3718,7 +3736,7 @@ 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 3721 "VideoMetadata.c"
+#line 3739 "VideoMetadata.c"
 	} else {
 		const gchar* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
@@ -3738,7 +3756,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 3741 "VideoMetadata.c"
+#line 3759 "VideoMetadata.c"
 		}
 #line 462 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp20_ = day;
@@ -3756,7 +3774,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 3759 "VideoMetadata.c"
+#line 3777 "VideoMetadata.c"
 	}
 #line 466 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	memset (&time, 0, sizeof (struct tm));
@@ -3780,7 +3798,7 @@ 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 3783 "VideoMetadata.c"
+#line 3801 "VideoMetadata.c"
 		GFile* _tmp32_ = NULL;
 		gchar* _tmp33_ = NULL;
 		gchar* _tmp34_ = NULL;
@@ -3798,13 +3816,13 @@ 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 3801 "VideoMetadata.c"
+#line 3819 "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 3807 "VideoMetadata.c"
+#line 3825 "VideoMetadata.c"
 }
 
 
@@ -3856,157 +3874,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 3859 "VideoMetadata.c"
+#line 3877 "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 3866 "VideoMetadata.c"
+#line 3884 "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 3872 "VideoMetadata.c"
+#line 3890 "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 3879 "VideoMetadata.c"
+#line 3897 "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 3885 "VideoMetadata.c"
+#line 3903 "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 3892 "VideoMetadata.c"
+#line 3910 "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 3898 "VideoMetadata.c"
+#line 3916 "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 3905 "VideoMetadata.c"
+#line 3923 "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 3911 "VideoMetadata.c"
+#line 3929 "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 3918 "VideoMetadata.c"
+#line 3936 "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 3924 "VideoMetadata.c"
+#line 3942 "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 3931 "VideoMetadata.c"
+#line 3949 "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 3937 "VideoMetadata.c"
+#line 3955 "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 3944 "VideoMetadata.c"
+#line 3962 "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 3950 "VideoMetadata.c"
+#line 3968 "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 3957 "VideoMetadata.c"
+#line 3975 "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 3963 "VideoMetadata.c"
+#line 3981 "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 3970 "VideoMetadata.c"
+#line 3988 "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 3976 "VideoMetadata.c"
+#line 3994 "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 3983 "VideoMetadata.c"
+#line 4001 "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 3989 "VideoMetadata.c"
+#line 4007 "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 3996 "VideoMetadata.c"
+#line 4014 "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 4002 "VideoMetadata.c"
+#line 4020 "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 4009 "VideoMetadata.c"
+#line 4027 "VideoMetadata.c"
 			}
 		}
 	}
@@ -4014,7 +4032,7 @@ 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 4017 "VideoMetadata.c"
+#line 4035 "VideoMetadata.c"
 }
 
 
@@ -4037,7 +4055,7 @@ static gchar* string_strip (const gchar* self) {
 	result = _result_;
 #line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 4040 "VideoMetadata.c"
+#line 4058 "VideoMetadata.c"
 }
 
 
@@ -4058,7 +4076,7 @@ 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 4061 "VideoMetadata.c"
+#line 4079 "VideoMetadata.c"
 	{
 		AVIChunk* _tmp2_ = NULL;
 		AVIChunk* _tmp3_ = NULL;
@@ -4072,7 +4090,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		avi_chunk_open_file (_tmp2_, &_inner_error_);
 #line 515 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4075 "VideoMetadata.c"
+#line 4093 "VideoMetadata.c"
 			goto __catch581_g_error;
 		}
 #line 516 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4081,7 +4099,7 @@ 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 4084 "VideoMetadata.c"
+#line 4102 "VideoMetadata.c"
 			goto __catch581_g_error;
 		}
 #line 517 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4092,14 +4110,14 @@ 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 4095 "VideoMetadata.c"
+#line 4113 "VideoMetadata.c"
 			goto __catch581_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 4102 "VideoMetadata.c"
+#line 4120 "VideoMetadata.c"
 			const gchar* _tmp7_ = NULL;
 			gchar* _tmp8_ = NULL;
 			gchar* _tmp9_ = NULL;
@@ -4116,11 +4134,11 @@ 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 4119 "VideoMetadata.c"
+#line 4137 "VideoMetadata.c"
 		}
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_g_free0 (sdate);
-#line 4123 "VideoMetadata.c"
+#line 4141 "VideoMetadata.c"
 	}
 	goto __finally581;
 	__catch581_g_error:
@@ -4140,11 +4158,13 @@ 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 4143 "VideoMetadata.c"
+#line 4161 "VideoMetadata.c"
 	}
 	__finally581:
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 4166 "VideoMetadata.c"
+		gulong _tmp13_ = 0UL;
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_avi_chunk_unref0 (chunk);
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4152,18 +4172,18 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		g_clear_error (&_inner_error_);
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		return 0UL;
-#line 4156 "VideoMetadata.c"
+		return _tmp13_;
+#line 4176 "VideoMetadata.c"
 	}
 	{
-		AVIChunk* _tmp13_ = NULL;
+		AVIChunk* _tmp14_ = NULL;
 #line 526 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		_tmp13_ = chunk;
+		_tmp14_ = chunk;
 #line 526 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		avi_chunk_close_file (_tmp13_, &_inner_error_);
+		avi_chunk_close_file (_tmp14_, &_inner_error_);
 #line 526 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4166 "VideoMetadata.c"
+#line 4186 "VideoMetadata.c"
 			goto __catch582_g_error;
 		}
 	}
@@ -4171,25 +4191,27 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 	__catch582_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
+		GError* _tmp15_ = NULL;
+		const gchar* _tmp16_ = NULL;
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		e = _inner_error_;
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_inner_error_ = NULL;
 #line 528 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		_tmp14_ = e;
+		_tmp15_ = e;
 #line 528 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		_tmp15_ = _tmp14_->message;
+		_tmp16_ = _tmp15_->message;
 #line 528 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		g_debug ("VideoMetadata.vala:528: Error while closing AVI file: %s", _tmp15_);
+		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 4188 "VideoMetadata.c"
+#line 4208 "VideoMetadata.c"
 	}
 	__finally582:
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 4213 "VideoMetadata.c"
+		gulong _tmp17_ = 0UL;
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_avi_chunk_unref0 (chunk);
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4197,8 +4219,8 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		g_clear_error (&_inner_error_);
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
-		return 0UL;
-#line 4201 "VideoMetadata.c"
+		return _tmp17_;
+#line 4223 "VideoMetadata.c"
 	}
 #line 530 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	result = timestamp;
@@ -4206,14 +4228,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 4209 "VideoMetadata.c"
+#line 4231 "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 4216 "VideoMetadata.c"
+#line 4238 "VideoMetadata.c"
 }
 
 
@@ -4222,7 +4244,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 4225 "VideoMetadata.c"
+#line 4247 "VideoMetadata.c"
 	}
 }
 
@@ -4232,11 +4254,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 4235 "VideoMetadata.c"
+#line 4257 "VideoMetadata.c"
 	} else {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4239 "VideoMetadata.c"
+#line 4261 "VideoMetadata.c"
 	}
 }
 
@@ -4244,37 +4266,37 @@ 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 4247 "VideoMetadata.c"
+#line 4269 "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 4254 "VideoMetadata.c"
+#line 4276 "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 4261 "VideoMetadata.c"
+#line 4283 "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 4265 "VideoMetadata.c"
+#line 4287 "VideoMetadata.c"
 		}
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = avi_metadata_loader_ref (object);
-#line 4269 "VideoMetadata.c"
+#line 4291 "VideoMetadata.c"
 	} else {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 4273 "VideoMetadata.c"
+#line 4295 "VideoMetadata.c"
 	}
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return NULL;
-#line 4277 "VideoMetadata.c"
+#line 4299 "VideoMetadata.c"
 }
 
 
@@ -4285,25 +4307,25 @@ static gchar* value_avi_metadata_loader_lcopy_value (const GValue* value, guint
 	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 4288 "VideoMetadata.c"
+#line 4310 "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 4294 "VideoMetadata.c"
+#line 4316 "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 4298 "VideoMetadata.c"
+#line 4320 "VideoMetadata.c"
 	} else {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		*object_p = avi_metadata_loader_ref (value->data[0].v_pointer);
-#line 4302 "VideoMetadata.c"
+#line 4324 "VideoMetadata.c"
 	}
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return NULL;
-#line 4306 "VideoMetadata.c"
+#line 4328 "VideoMetadata.c"
 }
 
 
@@ -4317,7 +4339,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 4320 "VideoMetadata.c"
+#line 4342 "VideoMetadata.c"
 }
 
 
@@ -4326,7 +4348,7 @@ 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 4329 "VideoMetadata.c"
+#line 4351 "VideoMetadata.c"
 }
 
 
@@ -4346,17 +4368,17 @@ 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 4349 "VideoMetadata.c"
+#line 4371 "VideoMetadata.c"
 	} else {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 4353 "VideoMetadata.c"
+#line 4375 "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 4359 "VideoMetadata.c"
+#line 4381 "VideoMetadata.c"
 	}
 }
 
@@ -4375,17 +4397,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 4378 "VideoMetadata.c"
+#line 4400 "VideoMetadata.c"
 	} else {
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 4382 "VideoMetadata.c"
+#line 4404 "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 4388 "VideoMetadata.c"
+#line 4410 "VideoMetadata.c"
 	}
 }
 
@@ -4397,7 +4419,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 4400 "VideoMetadata.c"
+#line 4422 "VideoMetadata.c"
 }
 
 
@@ -4408,7 +4430,7 @@ 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 4411 "VideoMetadata.c"
+#line 4433 "VideoMetadata.c"
 }
 
 
@@ -4420,7 +4442,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 4423 "VideoMetadata.c"
+#line 4445 "VideoMetadata.c"
 }
 
 
@@ -4445,7 +4467,7 @@ gpointer avi_metadata_loader_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 292 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return instance;
-#line 4448 "VideoMetadata.c"
+#line 4470 "VideoMetadata.c"
 }
 
 
@@ -4458,7 +4480,7 @@ 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 4461 "VideoMetadata.c"
+#line 4483 "VideoMetadata.c"
 	}
 }
 
@@ -4481,21 +4503,21 @@ 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 4484 "VideoMetadata.c"
+#line 4506 "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 4491 "VideoMetadata.c"
+#line 4513 "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 4498 "VideoMetadata.c"
+#line 4520 "VideoMetadata.c"
 }
 
 
@@ -4529,14 +4551,14 @@ 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 4532 "VideoMetadata.c"
+#line 4554 "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 4539 "VideoMetadata.c"
+#line 4561 "VideoMetadata.c"
 }
 
 
@@ -4558,7 +4580,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 4561 "VideoMetadata.c"
+#line 4583 "VideoMetadata.c"
 	}
 #line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp1_ = self->priv->file;
@@ -4572,7 +4594,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 4575 "VideoMetadata.c"
+#line 4597 "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));
@@ -4596,7 +4618,7 @@ 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 4599 "VideoMetadata.c"
+#line 4621 "VideoMetadata.c"
 }
 
 
@@ -4609,7 +4631,7 @@ 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 4612 "VideoMetadata.c"
+#line 4634 "VideoMetadata.c"
 		GDataInputStream* _tmp1_ = NULL;
 #line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp1_ = self->priv->input;
@@ -4621,13 +4643,13 @@ 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 4624 "VideoMetadata.c"
+#line 4646 "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 4630 "VideoMetadata.c"
+#line 4652 "VideoMetadata.c"
 	}
 }
 
@@ -4650,7 +4672,7 @@ 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 4653 "VideoMetadata.c"
+#line 4675 "VideoMetadata.c"
 	}
 }
 
@@ -4678,7 +4700,7 @@ 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 4681 "VideoMetadata.c"
+#line 4703 "VideoMetadata.c"
 	}
 }
 
@@ -4697,7 +4719,7 @@ AVIChunk* avi_chunk_get_first_child_chunk (AVIChunk* self) {
 	result = _tmp1_;
 #line 578 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 4700 "VideoMetadata.c"
+#line 4722 "VideoMetadata.c"
 }
 
 
@@ -4718,7 +4740,7 @@ 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 4721 "VideoMetadata.c"
+#line 4743 "VideoMetadata.c"
 		guint64 _tmp3_ = 0ULL;
 		guint64 _tmp4_ = 0ULL;
 #line 583 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4727,7 +4749,7 @@ static void avi_chunk_advance_section_offset (AVIChunk* self, guint64 amount) {
 		_tmp4_ = self->priv->section_offset;
 #line 583 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		amount = _tmp3_ - _tmp4_;
-#line 4730 "VideoMetadata.c"
+#line 4752 "VideoMetadata.c"
 	}
 #line 585 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp5_ = self->priv->section_offset;
@@ -4739,7 +4761,7 @@ 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 4742 "VideoMetadata.c"
+#line 4764 "VideoMetadata.c"
 		AVIChunk* _tmp8_ = NULL;
 		guint64 _tmp9_ = 0ULL;
 #line 587 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4748,7 +4770,7 @@ static void avi_chunk_advance_section_offset (AVIChunk* self, guint64 amount) {
 		_tmp9_ = amount;
 #line 587 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		avi_chunk_advance_section_offset (_tmp8_, _tmp9_);
-#line 4751 "VideoMetadata.c"
+#line 4773 "VideoMetadata.c"
 	}
 }
 
@@ -4771,17 +4793,19 @@ 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"
+		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 '\0';
-#line 4778 "VideoMetadata.c"
+		return _tmp3_;
+#line 4802 "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 4784 "VideoMetadata.c"
+#line 4808 "VideoMetadata.c"
 }
 
 
@@ -4803,17 +4827,19 @@ 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"
+		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 0U;
-#line 4810 "VideoMetadata.c"
+		return _tmp3_;
+#line 4836 "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 4816 "VideoMetadata.c"
+#line 4842 "VideoMetadata.c"
 }
 
 
@@ -4863,7 +4889,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 4866 "VideoMetadata.c"
+#line 4892 "VideoMetadata.c"
 	}
 #line 605 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp4_ = sb;
@@ -4883,7 +4909,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 4886 "VideoMetadata.c"
+#line 4912 "VideoMetadata.c"
 	}
 #line 606 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp8_ = sb;
@@ -4903,7 +4929,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 4906 "VideoMetadata.c"
+#line 4932 "VideoMetadata.c"
 	}
 #line 607 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp12_ = sb;
@@ -4923,7 +4949,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 4926 "VideoMetadata.c"
+#line 4952 "VideoMetadata.c"
 	}
 #line 608 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp16_ = sb;
@@ -4953,7 +4979,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 4956 "VideoMetadata.c"
+#line 4982 "VideoMetadata.c"
 	}
 #line 610 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	self->priv->section_size = (guint64) _tmp20_;
@@ -4961,7 +4987,7 @@ 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 4964 "VideoMetadata.c"
+#line 4990 "VideoMetadata.c"
 }
 
 
@@ -5003,7 +5029,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 5006 "VideoMetadata.c"
+#line 5032 "VideoMetadata.c"
 	}
 #line 616 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp3_ = sb;
@@ -5021,7 +5047,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 5024 "VideoMetadata.c"
+#line 5050 "VideoMetadata.c"
 	}
 #line 617 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp6_ = sb;
@@ -5039,7 +5065,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 5042 "VideoMetadata.c"
+#line 5068 "VideoMetadata.c"
 	}
 #line 618 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp9_ = sb;
@@ -5057,7 +5083,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 5060 "VideoMetadata.c"
+#line 5086 "VideoMetadata.c"
 	}
 #line 619 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	_tmp12_ = sb;
@@ -5075,7 +5101,7 @@ 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 5078 "VideoMetadata.c"
+#line 5104 "VideoMetadata.c"
 }
 
 
@@ -5094,13 +5120,13 @@ 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 5097 "VideoMetadata.c"
+#line 5123 "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 5103 "VideoMetadata.c"
+#line 5129 "VideoMetadata.c"
 }
 
 
@@ -5118,7 +5144,7 @@ gchar* avi_chunk_get_current_chunk_name (AVIChunk* self) {
 	result = _tmp1_;
 #line 630 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 5121 "VideoMetadata.c"
+#line 5147 "VideoMetadata.c"
 }
 
 
@@ -5133,7 +5159,7 @@ gboolean avi_chunk_is_last_chunk (AVIChunk* self) {
 	result = _tmp0_ == ((guint64) 0);
 #line 634 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 5136 "VideoMetadata.c"
+#line 5162 "VideoMetadata.c"
 }
 
 
@@ -5159,7 +5185,7 @@ guint64 avi_chunk_section_size_remaining (AVIChunk* self) {
 	result = _tmp2_ - _tmp3_;
 #line 639 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return result;
-#line 5162 "VideoMetadata.c"
+#line 5188 "VideoMetadata.c"
 }
 
 
@@ -5179,7 +5205,7 @@ gchar* avi_chunk_section_to_string (AVIChunk* self, GError** error) {
 	sb = _tmp0_;
 #line 645 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	while (TRUE) {
-#line 5182 "VideoMetadata.c"
+#line 5208 "VideoMetadata.c"
 		guint64 _tmp1_ = 0ULL;
 		guint64 _tmp2_ = 0ULL;
 		guchar _tmp3_ = '\0';
@@ -5195,7 +5221,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 5198 "VideoMetadata.c"
+#line 5224 "VideoMetadata.c"
 		}
 #line 646 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp4_ = avi_chunk_read_byte (self, &_inner_error_);
@@ -5209,7 +5235,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 5212 "VideoMetadata.c"
+#line 5238 "VideoMetadata.c"
 		}
 #line 646 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp5_ = sb;
@@ -5221,7 +5247,7 @@ 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 5224 "VideoMetadata.c"
+#line 5250 "VideoMetadata.c"
 			GString* _tmp8_ = NULL;
 			const gchar* _tmp9_ = NULL;
 			gchar* _tmp10_ = NULL;
@@ -5237,7 +5263,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 5240 "VideoMetadata.c"
+#line 5266 "VideoMetadata.c"
 		}
 	}
 #line 651 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -5252,14 +5278,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 5255 "VideoMetadata.c"
+#line 5281 "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 5262 "VideoMetadata.c"
+#line 5288 "VideoMetadata.c"
 }
 
 
@@ -5268,7 +5294,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 5271 "VideoMetadata.c"
+#line 5297 "VideoMetadata.c"
 	}
 }
 
@@ -5278,11 +5304,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 5281 "VideoMetadata.c"
+#line 5307 "VideoMetadata.c"
 	} else {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5285 "VideoMetadata.c"
+#line 5311 "VideoMetadata.c"
 	}
 }
 
@@ -5290,37 +5316,37 @@ 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 5293 "VideoMetadata.c"
+#line 5319 "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 5300 "VideoMetadata.c"
+#line 5326 "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 5307 "VideoMetadata.c"
+#line 5333 "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 5311 "VideoMetadata.c"
+#line 5337 "VideoMetadata.c"
 		}
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = avi_chunk_ref (object);
-#line 5315 "VideoMetadata.c"
+#line 5341 "VideoMetadata.c"
 	} else {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 5319 "VideoMetadata.c"
+#line 5345 "VideoMetadata.c"
 	}
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return NULL;
-#line 5323 "VideoMetadata.c"
+#line 5349 "VideoMetadata.c"
 }
 
 
@@ -5331,25 +5357,25 @@ static gchar* value_avi_chunk_lcopy_value (const GValue* value, guint n_collect_
 	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 5334 "VideoMetadata.c"
+#line 5360 "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 5340 "VideoMetadata.c"
+#line 5366 "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 5344 "VideoMetadata.c"
+#line 5370 "VideoMetadata.c"
 	} else {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		*object_p = avi_chunk_ref (value->data[0].v_pointer);
-#line 5348 "VideoMetadata.c"
+#line 5374 "VideoMetadata.c"
 	}
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return NULL;
-#line 5352 "VideoMetadata.c"
+#line 5378 "VideoMetadata.c"
 }
 
 
@@ -5363,7 +5389,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 5366 "VideoMetadata.c"
+#line 5392 "VideoMetadata.c"
 }
 
 
@@ -5372,7 +5398,7 @@ 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 5375 "VideoMetadata.c"
+#line 5401 "VideoMetadata.c"
 }
 
 
@@ -5392,17 +5418,17 @@ 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 5395 "VideoMetadata.c"
+#line 5421 "VideoMetadata.c"
 	} else {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 5399 "VideoMetadata.c"
+#line 5425 "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 5405 "VideoMetadata.c"
+#line 5431 "VideoMetadata.c"
 	}
 }
 
@@ -5421,17 +5447,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 5424 "VideoMetadata.c"
+#line 5450 "VideoMetadata.c"
 	} else {
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 5428 "VideoMetadata.c"
+#line 5454 "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 5434 "VideoMetadata.c"
+#line 5460 "VideoMetadata.c"
 	}
 }
 
@@ -5443,7 +5469,7 @@ 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 5446 "VideoMetadata.c"
+#line 5472 "VideoMetadata.c"
 }
 
 
@@ -5467,7 +5493,7 @@ 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 5470 "VideoMetadata.c"
+#line 5496 "VideoMetadata.c"
 }
 
 
@@ -5485,7 +5511,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 5488 "VideoMetadata.c"
+#line 5514 "VideoMetadata.c"
 }
 
 
@@ -5510,7 +5536,7 @@ gpointer avi_chunk_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 534 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	return instance;
-#line 5513 "VideoMetadata.c"
+#line 5539 "VideoMetadata.c"
 }
 
 
@@ -5523,7 +5549,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 5526 "VideoMetadata.c"
+#line 5552 "VideoMetadata.c"
 	}
 }
 
diff --git a/src/VideoMonitor.c b/src/VideoMonitor.c
index 638b755..d7410e2 100644
--- a/src/VideoMonitor.c
+++ b/src/VideoMonitor.c
@@ -1,4 +1,4 @@
-/* VideoMonitor.c generated by valac 0.34.4, the Vala compiler
+/* VideoMonitor.c generated by valac 0.34.7, the Vala compiler
  * generated from VideoMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 = 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 = video_updates_real_is_all_updated;
+	((MonitorableUpdatesClass *) klass)->is_all_updated = (gboolean (*)(MonitorableUpdates*)) video_updates_real_is_all_updated;
 #line 674 "VideoMonitor.c"
 }
 
@@ -1050,7 +1050,7 @@ static GeeCollection* video_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 117 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_return_val_if_fail (G_IS_FILE_INFO (info), NULL);
 #line 119 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	_tmp0_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 119 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	matched = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 120 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1890,7 +1890,7 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				_tmp11_ = check;
 #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-				_tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
+				_tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				_tmp13_ = _tmp12_;
 #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1947,7 +1947,7 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1948 "VideoMonitor.c"
 					GeeArrayList* _tmp20_ = NULL;
 #line 272 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-					_tmp20_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_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"
 					_g_object_unref0 (check);
 #line 272 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1999,7 +1999,7 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 281 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp27_ = check;
 #line 281 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-		_tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 281 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp29_ = _tmp28_;
 #line 281 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -2017,7 +2017,7 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 285 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp33_ = check;
 #line 285 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-		_tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 285 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp35_ = _tmp34_;
 #line 285 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -2041,7 +2041,7 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			_tmp38_ = _video_list;
 #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-			_tmp39_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp39_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			_tmp40_ = _tmp39_;
 #line 286 "/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 = 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"
 }
 
@@ -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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
diff --git a/src/VideoSupport.c b/src/VideoSupport.c
index d201a2a..fb3aa6e 100644
--- a/src/VideoSupport.c
+++ b/src/VideoSupport.c
@@ -1,4 +1,4 @@
-/* VideoSupport.c generated by valac 0.34.4, the Vala compiler
+/* VideoSupport.c generated by valac 0.34.7, the Vala compiler
  * generated from VideoSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1887,11 +1887,11 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 	gchar* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
 	const gchar* _tmp8_ = NULL;
-	GFile* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
+	GFile* _tmp23_ = NULL;
 	gchar* _tmp24_ = NULL;
-	gboolean _tmp25_ = FALSE;
+	gchar* _tmp25_ = NULL;
 	gboolean _tmp26_ = FALSE;
+	gboolean _tmp27_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 55 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
@@ -2030,6 +2030,8 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 		__finally493:
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 2034 "VideoSupport.c"
+			gboolean _tmp22_ = FALSE;
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (mime_type);
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2037,29 +2039,29 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			return FALSE;
-#line 2042 "VideoSupport.c"
+			return _tmp22_;
+#line 2044 "VideoSupport.c"
 		}
 	}
 #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp22_ = file;
+	_tmp23_ = file;
 #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp23_ = g_file_get_basename (_tmp22_);
+	_tmp24_ = g_file_get_basename (_tmp23_);
 #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp24_ = _tmp23_;
+	_tmp25_ = _tmp24_;
 #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp25_ = video_reader_is_supported_video_filename (_tmp24_);
+	_tmp26_ = video_reader_is_supported_video_filename (_tmp25_);
 #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp26_ = _tmp25_;
+	_tmp27_ = _tmp26_;
 #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_free0 (_tmp24_);
+	_g_free0 (_tmp25_);
 #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = _tmp26_;
+	result = _tmp27_;
 #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (mime_type);
 #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 2063 "VideoSupport.c"
+#line 2065 "VideoSupport.c"
 }
 
 
@@ -2092,7 +2094,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp2_ = start;
 #line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 2096 "VideoSupport.c"
+#line 2098 "VideoSupport.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -2101,13 +2103,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp4_ = start;
 #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 2105 "VideoSupport.c"
+#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 2111 "VideoSupport.c"
+#line 2113 "VideoSupport.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
 #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -2116,13 +2118,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp7_ = end;
 #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 2120 "VideoSupport.c"
+#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 2126 "VideoSupport.c"
+#line 2128 "VideoSupport.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -2131,11 +2133,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp11_ = string_length;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 2135 "VideoSupport.c"
+#line 2137 "VideoSupport.c"
 	} else {
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 2139 "VideoSupport.c"
+#line 2141 "VideoSupport.c"
 	}
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
@@ -2143,7 +2145,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp13_ = end;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 2147 "VideoSupport.c"
+#line 2149 "VideoSupport.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -2152,11 +2154,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp15_ = string_length;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 2156 "VideoSupport.c"
+#line 2158 "VideoSupport.c"
 	} else {
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 2160 "VideoSupport.c"
+#line 2162 "VideoSupport.c"
 	}
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
@@ -2178,7 +2180,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	result = _tmp21_;
 #line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2182 "VideoSupport.c"
+#line 2184 "VideoSupport.c"
 }
 
 
@@ -2220,7 +2222,7 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 	_tmp7_ = _tmp6_;
 #line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp7_ >= 6) {
-#line 2224 "VideoSupport.c"
+#line 2226 "VideoSupport.c"
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
@@ -2234,15 +2236,15 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 		_tmp4_ = g_strcmp0 (_tmp10_, "video/") == 0;
 #line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp10_);
-#line 2238 "VideoSupport.c"
+#line 2240 "VideoSupport.c"
 	} else {
 #line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = FALSE;
-#line 2242 "VideoSupport.c"
+#line 2244 "VideoSupport.c"
 	}
 #line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp4_) {
-#line 2246 "VideoSupport.c"
+#line 2248 "VideoSupport.c"
 		gchar* extension = NULL;
 		gchar* name = NULL;
 		const gchar* _tmp11_ = NULL;
@@ -2279,7 +2281,7 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 			_g_free0 (mime_type);
 #line 83 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 2283 "VideoSupport.c"
+#line 2285 "VideoSupport.c"
 		}
 		{
 			const gchar** s_collection = NULL;
@@ -2292,14 +2294,14 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 			s_collection_length1 = G_N_ELEMENTS (VIDEO_READER_METADATA_ONLY_FILE_EXTENSIONS);
 #line 85 "/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 2296 "VideoSupport.c"
+#line 2298 "VideoSupport.c"
 				gchar* _tmp15_ = NULL;
 				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 2303 "VideoSupport.c"
+#line 2305 "VideoSupport.c"
 				{
 					const gchar* _tmp16_ = NULL;
 					const gchar* _tmp17_ = NULL;
@@ -2324,11 +2326,11 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 						_g_free0 (mime_type);
 #line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						return result;
-#line 2328 "VideoSupport.c"
+#line 2330 "VideoSupport.c"
 					}
 #line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (s);
-#line 2332 "VideoSupport.c"
+#line 2334 "VideoSupport.c"
 				}
 			}
 		}
@@ -2342,7 +2344,7 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 		_g_free0 (mime_type);
 #line 90 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2346 "VideoSupport.c"
+#line 2348 "VideoSupport.c"
 	} else {
 		const gchar* _tmp19_ = NULL;
 		const gchar* _tmp20_ = NULL;
@@ -2358,11 +2360,11 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 		_g_free0 (mime_type);
 #line 93 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2362 "VideoSupport.c"
+#line 2364 "VideoSupport.c"
 	}
 #line 74 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (mime_type);
-#line 2366 "VideoSupport.c"
+#line 2368 "VideoSupport.c"
 }
 
 
@@ -2474,7 +2476,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 	file = _tmp2_;
 #line 103 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	info = NULL;
-#line 2478 "VideoSupport.c"
+#line 2480 "VideoSupport.c"
 	{
 		GFileInfo* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
@@ -2488,7 +2490,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_tmp3_ = _tmp5_;
 #line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2492 "VideoSupport.c"
+#line 2494 "VideoSupport.c"
 			goto __catch494_g_error;
 		}
 #line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2501,7 +2503,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		info = _tmp6_;
 #line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2505 "VideoSupport.c"
+#line 2507 "VideoSupport.c"
 	}
 	goto __finally494;
 	__catch494_g_error:
@@ -2521,7 +2523,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_object_unref0 (file);
 #line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2525 "VideoSupport.c"
+#line 2527 "VideoSupport.c"
 	}
 	__finally494:
 #line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2536,7 +2538,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		g_clear_error (&_inner_error_);
 #line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 2540 "VideoSupport.c"
+#line 2542 "VideoSupport.c"
 	}
 #line 111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = info;
@@ -2552,7 +2554,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_object_unref0 (file);
 #line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2556 "VideoSupport.c"
+#line 2558 "VideoSupport.c"
 	}
 #line 114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_ = file;
@@ -2560,7 +2562,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 	_tmp10_ = video_reader_is_supported_video_file (_tmp9_);
 #line 114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!_tmp10_) {
-#line 2564 "VideoSupport.c"
+#line 2566 "VideoSupport.c"
 		GFile* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
@@ -2582,7 +2584,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_object_unref0 (file);
 #line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2586 "VideoSupport.c"
+#line 2588 "VideoSupport.c"
 	}
 #line 121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp14_ = info;
@@ -2626,7 +2628,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 	_tmp25_ = video_reader_read_preview_frame (_tmp24_);
 #line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	preview_frame = _tmp25_;
-#line 2630 "VideoSupport.c"
+#line 2632 "VideoSupport.c"
 	{
 		gdouble _tmp26_ = 0.0;
 		VideoReader* _tmp27_ = NULL;
@@ -2641,7 +2643,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
-#line 2645 "VideoSupport.c"
+#line 2647 "VideoSupport.c"
 				goto __catch495_video_error;
 			}
 #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2662,11 +2664,11 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			g_clear_error (&_inner_error_);
 #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0;
-#line 2666 "VideoSupport.c"
+#line 2668 "VideoSupport.c"
 		}
 #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		clip_duration = _tmp26_;
-#line 2670 "VideoSupport.c"
+#line 2672 "VideoSupport.c"
 	}
 	goto __finally495;
 	__catch495_video_error:
@@ -2699,7 +2701,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			_g_object_unref0 (file);
 #line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 2703 "VideoSupport.c"
+#line 2705 "VideoSupport.c"
 		} else {
 			GError* _tmp30_ = NULL;
 #line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2710,17 +2712,17 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 				is_interpretable = FALSE;
 #line 141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				clip_duration = 0.0;
-#line 2714 "VideoSupport.c"
+#line 2716 "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" \
 " of video error occurred");
-#line 2718 "VideoSupport.c"
+#line 2720 "VideoSupport.c"
 			}
 		}
 #line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 2723 "VideoSupport.c"
+#line 2725 "VideoSupport.c"
 	}
 	__finally495:
 #line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2743,7 +2745,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		g_clear_error (&_inner_error_);
 #line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 2746 "VideoSupport.c"
+#line 2748 "VideoSupport.c"
 	}
 	{
 		VideoMetadata* metadata = NULL;
@@ -2770,7 +2772,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		metadata = _tmp32_;
 #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2773 "VideoSupport.c"
+#line 2775 "VideoSupport.c"
 			goto __catch496_g_error;
 		}
 #line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2783,7 +2785,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_tmp36_ = creation_date_time;
 #line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp36_ != NULL) {
-#line 2786 "VideoSupport.c"
+#line 2788 "VideoSupport.c"
 			MetadataDateTime* _tmp37_ = NULL;
 			time_t _tmp38_ = 0;
 #line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2792,15 +2794,15 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			_tmp38_ = metadata_date_time_get_timestamp (_tmp37_);
 #line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp35_ = _tmp38_ != ((time_t) 0);
-#line 2795 "VideoSupport.c"
+#line 2797 "VideoSupport.c"
 		} else {
 #line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp35_ = FALSE;
-#line 2799 "VideoSupport.c"
+#line 2801 "VideoSupport.c"
 		}
 #line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp35_) {
-#line 2803 "VideoSupport.c"
+#line 2805 "VideoSupport.c"
 			MetadataDateTime* _tmp39_ = NULL;
 			time_t _tmp40_ = 0;
 #line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2809,7 +2811,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			_tmp40_ = metadata_date_time_get_timestamp (_tmp39_);
 #line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			exposure_time = _tmp40_;
-#line 2812 "VideoSupport.c"
+#line 2814 "VideoSupport.c"
 		}
 #line 154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp41_ = metadata;
@@ -2827,7 +2829,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_tmp45_ = video_title;
 #line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp45_ != NULL) {
-#line 2830 "VideoSupport.c"
+#line 2832 "VideoSupport.c"
 			const gchar* _tmp46_ = NULL;
 			gchar* _tmp47_ = NULL;
 #line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2838,13 +2840,13 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			_g_free0 (title);
 #line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			title = _tmp47_;
-#line 2841 "VideoSupport.c"
+#line 2843 "VideoSupport.c"
 		}
 #line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp48_ = video_comment;
 #line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp48_ != NULL) {
-#line 2847 "VideoSupport.c"
+#line 2849 "VideoSupport.c"
 			const gchar* _tmp49_ = NULL;
 			gchar* _tmp50_ = NULL;
 #line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2855,7 +2857,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			_g_free0 (comment);
 #line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			comment = _tmp50_;
-#line 2858 "VideoSupport.c"
+#line 2860 "VideoSupport.c"
 		}
 #line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (video_comment);
@@ -2865,7 +2867,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_metadata_date_time_unref0 (creation_date_time);
 #line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_media_metadata_unref0 (metadata);
-#line 2868 "VideoSupport.c"
+#line 2870 "VideoSupport.c"
 	}
 	goto __finally496;
 	__catch496_g_error:
@@ -2885,7 +2887,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		g_warning ("VideoSupport.vala:161: Unable to read video metadata: %s", _tmp52_);
 #line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 2888 "VideoSupport.c"
+#line 2890 "VideoSupport.c"
 	}
 	__finally496:
 #line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2908,13 +2910,13 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		g_clear_error (&_inner_error_);
 #line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 2911 "VideoSupport.c"
+#line 2913 "VideoSupport.c"
 	}
 #line 164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp53_ = exposure_time;
 #line 164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp53_ == ((time_t) 0)) {
-#line 2917 "VideoSupport.c"
+#line 2919 "VideoSupport.c"
 		gint64 _tmp54_ = 0LL;
 		VideoReader* _tmp55_ = NULL;
 		GDateTime* _tmp56_ = NULL;
@@ -2924,7 +2926,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_tmp56_ = _tmp55_->priv->_timestamp;
 #line 166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp56_ != NULL) {
-#line 2927 "VideoSupport.c"
+#line 2929 "VideoSupport.c"
 			VideoReader* _tmp57_ = NULL;
 			GDateTime* _tmp58_ = NULL;
 			gint64 _tmp59_ = 0LL;
@@ -2936,15 +2938,15 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			_tmp59_ = g_date_time_to_unix (_tmp58_);
 #line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp54_ = _tmp59_;
-#line 2939 "VideoSupport.c"
+#line 2941 "VideoSupport.c"
 		} else {
 #line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp54_ = (gint64) 0;
-#line 2943 "VideoSupport.c"
+#line 2945 "VideoSupport.c"
 		}
 #line 166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		exposure_time = (time_t) _tmp54_;
-#line 2947 "VideoSupport.c"
+#line 2949 "VideoSupport.c"
 	}
 #line 170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp60_ = params;
@@ -3120,7 +3122,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 	_tmp122_ = _tmp121_->thumbnails;
 #line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp122_ != NULL) {
-#line 3123 "VideoSupport.c"
+#line 3125 "VideoSupport.c"
 		VideoImportParams* _tmp123_ = NULL;
 		Thumbnails* _tmp124_ = NULL;
 		VideoImportParams* _tmp125_ = NULL;
@@ -3142,7 +3144,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_tmp127_ = preview_frame;
 #line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		thumbnail_cache_generate_for_video_frame (_tmp126_, _tmp127_);
-#line 3145 "VideoSupport.c"
+#line 3147 "VideoSupport.c"
 	}
 #line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = IMPORT_RESULT_SUCCESS;
@@ -3160,7 +3162,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 	_g_object_unref0 (file);
 #line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3163 "VideoSupport.c"
+#line 3165 "VideoSupport.c"
 }
 
 
@@ -3172,14 +3174,14 @@ static GDate* _g_date_dup (GDate* self) {
 	memcpy (dup, self, sizeof (GDate));
 #line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return dup;
-#line 3175 "VideoSupport.c"
+#line 3177 "VideoSupport.c"
 }
 
 
 static gpointer __g_date_dup0 (gpointer self) {
 #line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? _g_date_dup (self) : NULL;
-#line 3182 "VideoSupport.c"
+#line 3184 "VideoSupport.c"
 }
 
 
@@ -3192,7 +3194,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 	_tmp0_ = video_reader_does_file_exist (self);
 #line 201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!_tmp0_) {
-#line 3195 "VideoSupport.c"
+#line 3197 "VideoSupport.c"
 		GFile* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
@@ -3226,7 +3228,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3229 "VideoSupport.c"
+#line 3231 "VideoSupport.c"
 		} else {
 #line 202 "/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);
@@ -3234,7 +3236,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3237 "VideoSupport.c"
+#line 3239 "VideoSupport.c"
 		}
 	}
 	{
@@ -3259,7 +3261,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		d = _tmp8_;
 #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3262 "VideoSupport.c"
+#line 3264 "VideoSupport.c"
 			goto __catch497_g_error;
 		}
 #line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3282,7 +3284,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (d);
-#line 3285 "VideoSupport.c"
+#line 3287 "VideoSupport.c"
 			goto __catch497_g_error;
 		}
 #line 209 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3299,7 +3301,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		_tmp19_ = gst_discoverer_info_get_tags (_tmp18_);
 #line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp19_ != NULL) {
-#line 3302 "VideoSupport.c"
+#line 3304 "VideoSupport.c"
 			GstDiscovererInfo* _tmp20_ = NULL;
 			GstTagList* _tmp21_ = NULL;
 			GDate _tmp22_ = {0};
@@ -3322,21 +3324,21 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 			video_date = _tmp25_;
 #line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = _tmp23_;
-#line 3325 "VideoSupport.c"
+#line 3327 "VideoSupport.c"
 		} else {
 #line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = FALSE;
-#line 3329 "VideoSupport.c"
+#line 3331 "VideoSupport.c"
 		}
 #line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp17_) {
-#line 3333 "VideoSupport.c"
+#line 3335 "VideoSupport.c"
 			GDate* _tmp26_ = NULL;
 #line 217 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp26_ = video_date;
 #line 217 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp26_ != NULL) {
-#line 3339 "VideoSupport.c"
+#line 3341 "VideoSupport.c"
 				GDate* _tmp27_ = NULL;
 				GDateYear _tmp28_ = 0U;
 				GDate* _tmp29_ = NULL;
@@ -3365,7 +3367,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 				video_reader_set_timestamp (self, _tmp34_);
 #line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_date_time_unref0 (_tmp34_);
-#line 3368 "VideoSupport.c"
+#line 3370 "VideoSupport.c"
 			}
 		}
 #line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3374,7 +3376,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		_g_object_unref0 (info);
 #line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (d);
-#line 3377 "VideoSupport.c"
+#line 3379 "VideoSupport.c"
 	}
 	goto __finally497;
 	__catch497_g_error:
@@ -3416,7 +3418,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		_inner_error_ = _tmp42_;
 #line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 3419 "VideoSupport.c"
+#line 3421 "VideoSupport.c"
 		goto __finally497;
 	}
 	__finally497:
@@ -3428,7 +3430,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3431 "VideoSupport.c"
+#line 3433 "VideoSupport.c"
 		} else {
 #line 205 "/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);
@@ -3436,7 +3438,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3439 "VideoSupport.c"
+#line 3441 "VideoSupport.c"
 		}
 	}
 }
@@ -3453,7 +3455,7 @@ static gboolean video_reader_on_thumbnailer_timer (VideoReader* self) {
 	_tmp0_ = self->priv->thumbnailer_pid;
 #line 232 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ != ((GPid) 0)) {
-#line 3456 "VideoSupport.c"
+#line 3458 "VideoSupport.c"
 		GPid _tmp1_ = 0;
 		GPid _tmp2_ = 0;
 #line 233 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3464,13 +3466,13 @@ static gboolean video_reader_on_thumbnailer_timer (VideoReader* self) {
 		_tmp2_ = self->priv->thumbnailer_pid;
 #line 234 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		kill ((pid_t) _tmp2_, SIGKILL);
-#line 3467 "VideoSupport.c"
+#line 3469 "VideoSupport.c"
 	}
 #line 236 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = FALSE;
 #line 236 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3473 "VideoSupport.c"
+#line 3475 "VideoSupport.c"
 }
 
 
@@ -3479,7 +3481,7 @@ static gboolean _video_reader_on_thumbnailer_timer_gsource_func (gpointer self)
 	result = video_reader_on_thumbnailer_timer ((VideoReader*) self);
 #line 259 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3482 "VideoSupport.c"
+#line 3484 "VideoSupport.c"
 }
 
 
@@ -3556,7 +3558,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 	argv_length1 = _tmp10__length1;
 #line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_argv_size_ = argv_length1;
-#line 3559 "VideoSupport.c"
+#line 3561 "VideoSupport.c"
 	{
 		gchar** _tmp11_ = NULL;
 		gint _tmp11__length1 = 0;
@@ -3575,14 +3577,14 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		child_stdout = _tmp13_;
 #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3578 "VideoSupport.c"
+#line 3580 "VideoSupport.c"
 			goto __catch498_g_error;
 		}
 #line 250 "/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 3585 "VideoSupport.c"
+#line 3587 "VideoSupport.c"
 	}
 	goto __finally498;
 	__catch498_g_error:
@@ -3605,13 +3607,13 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		_tmp17_ = self->priv->thumbnailer_pid;
 #line 253 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp17_ != ((GPid) 0)) {
-#line 3608 "VideoSupport.c"
+#line 3610 "VideoSupport.c"
 			GPid _tmp18_ = 0;
 #line 254 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = self->priv->thumbnailer_pid;
 #line 254 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_spawn_close_pid (_tmp18_);
-#line 3614 "VideoSupport.c"
+#line 3616 "VideoSupport.c"
 		}
 #line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
@@ -3621,7 +3623,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
 #line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 3624 "VideoSupport.c"
+#line 3626 "VideoSupport.c"
 	}
 	__finally498:
 #line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3634,13 +3636,13 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		g_clear_error (&_inner_error_);
 #line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 3637 "VideoSupport.c"
+#line 3639 "VideoSupport.c"
 	}
 #line 259 "/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"
 	buf = NULL;
-#line 3643 "VideoSupport.c"
+#line 3645 "VideoSupport.c"
 	{
 		GUnixInputStream* unix_input = NULL;
 		gint _tmp19_ = 0;
@@ -3665,7 +3667,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (unix_input);
-#line 3668 "VideoSupport.c"
+#line 3670 "VideoSupport.c"
 			goto __catch499_g_error;
 		}
 #line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3680,7 +3682,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		_g_object_unref0 (_tmp21_);
 #line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (unix_input);
-#line 3683 "VideoSupport.c"
+#line 3685 "VideoSupport.c"
 	}
 	goto __finally499;
 	__catch499_g_error:
@@ -3704,7 +3706,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		buf = NULL;
 #line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 3707 "VideoSupport.c"
+#line 3709 "VideoSupport.c"
 	}
 	__finally499:
 #line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3719,7 +3721,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		g_clear_error (&_inner_error_);
 #line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 3722 "VideoSupport.c"
+#line 3724 "VideoSupport.c"
 	}
 #line 272 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	child_status = 0;
@@ -3735,7 +3737,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 	_tmp30_ = ret_waitpid;
 #line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp30_ < 0) {
-#line 3738 "VideoSupport.c"
+#line 3740 "VideoSupport.c"
 		gint _tmp31_ = 0;
 #line 275 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp31_ = ret_waitpid;
@@ -3745,7 +3747,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		_g_object_unref0 (buf);
 #line 276 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		buf = NULL;
-#line 3748 "VideoSupport.c"
+#line 3750 "VideoSupport.c"
 	} else {
 		gint _tmp32_ = 0;
 		gint _tmp33_ = 0;
@@ -3755,7 +3757,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		_tmp33_ = WEXITSTATUS (_tmp32_);
 #line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (0 != _tmp33_) {
-#line 3758 "VideoSupport.c"
+#line 3760 "VideoSupport.c"
 			gint _tmp34_ = 0;
 			gint _tmp35_ = 0;
 #line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3768,7 +3770,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 			_g_object_unref0 (buf);
 #line 280 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			buf = NULL;
-#line 3771 "VideoSupport.c"
+#line 3773 "VideoSupport.c"
 		}
 	}
 #line 283 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3783,7 +3785,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 	argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
 #line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3786 "VideoSupport.c"
+#line 3788 "VideoSupport.c"
 }
 
 
@@ -3812,7 +3814,7 @@ static gboolean video_reader_does_file_exist (VideoReader* self) {
 	result = _tmp4_;
 #line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3815 "VideoSupport.c"
+#line 3817 "VideoSupport.c"
 }
 
 
@@ -3833,7 +3835,7 @@ GdkPixbuf* video_reader_read_preview_frame (VideoReader* self) {
 	_tmp0_ = self->priv->preview_frame;
 #line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ != NULL) {
-#line 3836 "VideoSupport.c"
+#line 3838 "VideoSupport.c"
 		GdkPixbuf* _tmp1_ = NULL;
 		GdkPixbuf* _tmp2_ = NULL;
 #line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3844,7 +3846,7 @@ GdkPixbuf* video_reader_read_preview_frame (VideoReader* self) {
 		result = _tmp2_;
 #line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 3847 "VideoSupport.c"
+#line 3849 "VideoSupport.c"
 	}
 #line 296 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_reader_does_file_exist (self);
@@ -3854,7 +3856,7 @@ GdkPixbuf* video_reader_read_preview_frame (VideoReader* self) {
 		result = NULL;
 #line 297 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 3857 "VideoSupport.c"
+#line 3859 "VideoSupport.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = self->priv->file;
@@ -3874,7 +3876,7 @@ GdkPixbuf* video_reader_read_preview_frame (VideoReader* self) {
 	_tmp8_ = self->priv->preview_frame;
 #line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (NULL == _tmp8_) {
-#line 3877 "VideoSupport.c"
+#line 3879 "VideoSupport.c"
 		GdkPixbuf* _tmp9_ = NULL;
 #line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = resources_get_noninterpretable_badge_pixbuf ();
@@ -3882,7 +3884,7 @@ GdkPixbuf* video_reader_read_preview_frame (VideoReader* self) {
 		_g_object_unref0 (self->priv->preview_frame);
 #line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		self->priv->preview_frame = _tmp9_;
-#line 3885 "VideoSupport.c"
+#line 3887 "VideoSupport.c"
 	}
 #line 304 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = self->priv->preview_frame;
@@ -3892,14 +3894,14 @@ GdkPixbuf* video_reader_read_preview_frame (VideoReader* self) {
 	result = _tmp11_;
 #line 304 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3895 "VideoSupport.c"
+#line 3897 "VideoSupport.c"
 }
 
 
 gdouble video_reader_read_clip_duration (VideoReader* self, GError** error) {
 	gdouble result = 0.0;
 	gdouble _tmp0_ = 0.0;
-	gdouble _tmp1_ = 0.0;
+	gdouble _tmp3_ = 0.0;
 	GError * _inner_error_ = NULL;
 #line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), 0.0);
@@ -3913,29 +3915,32 @@ gdouble video_reader_read_clip_duration (VideoReader* self, GError** error) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
+#line 3918 "VideoSupport.c"
+				gdouble _tmp1_ = 0.0;
 #line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_propagate_error (error, _inner_error_);
 #line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				return 0.0;
-#line 3920 "VideoSupport.c"
+				return _tmp1_;
+#line 3924 "VideoSupport.c"
 			} else {
+				gdouble _tmp2_ = 0.0;
 #line 309 "/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"
 				g_clear_error (&_inner_error_);
 #line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				return 0.0;
-#line 3928 "VideoSupport.c"
+				return _tmp2_;
+#line 3933 "VideoSupport.c"
 			}
 		}
 	}
 #line 311 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = self->priv->clip_duration;
+	_tmp3_ = self->priv->clip_duration;
 #line 311 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = _tmp1_;
+	result = _tmp3_;
 #line 311 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3938 "VideoSupport.c"
+#line 3943 "VideoSupport.c"
 }
 
 
@@ -3979,13 +3984,13 @@ VideoMetadata* video_reader_read_metadata (VideoReader* self, GError** error) {
 		_media_metadata_unref0 (metadata);
 #line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 3982 "VideoSupport.c"
+#line 3987 "VideoSupport.c"
 	}
 #line 318 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = metadata;
 #line 318 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3988 "VideoSupport.c"
+#line 3993 "VideoSupport.c"
 }
 
 
@@ -4000,14 +4005,14 @@ GDateTime* video_reader_get_timestamp (VideoReader* self) {
 	result = _tmp0_;
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 4003 "VideoSupport.c"
+#line 4008 "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 4010 "VideoSupport.c"
+#line 4015 "VideoSupport.c"
 }
 
 
@@ -4024,14 +4029,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 4027 "VideoSupport.c"
+#line 4032 "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 4034 "VideoSupport.c"
+#line 4039 "VideoSupport.c"
 }
 
 
@@ -4040,7 +4045,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 4043 "VideoSupport.c"
+#line 4048 "VideoSupport.c"
 	}
 }
 
@@ -4050,11 +4055,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 4053 "VideoSupport.c"
+#line 4058 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4057 "VideoSupport.c"
+#line 4062 "VideoSupport.c"
 	}
 }
 
@@ -4062,37 +4067,37 @@ 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 4065 "VideoSupport.c"
+#line 4070 "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 4072 "VideoSupport.c"
+#line 4077 "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 4079 "VideoSupport.c"
+#line 4084 "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 4083 "VideoSupport.c"
+#line 4088 "VideoSupport.c"
 		}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = video_reader_ref (object);
-#line 4087 "VideoSupport.c"
+#line 4092 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4091 "VideoSupport.c"
+#line 4096 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 4095 "VideoSupport.c"
+#line 4100 "VideoSupport.c"
 }
 
 
@@ -4103,25 +4108,25 @@ static gchar* value_video_reader_lcopy_value (const GValue* value, guint n_colle
 	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 4106 "VideoSupport.c"
+#line 4111 "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 4112 "VideoSupport.c"
+#line 4117 "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 4116 "VideoSupport.c"
+#line 4121 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = video_reader_ref (value->data[0].v_pointer);
-#line 4120 "VideoSupport.c"
+#line 4125 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 4124 "VideoSupport.c"
+#line 4129 "VideoSupport.c"
 }
 
 
@@ -4135,7 +4140,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 4138 "VideoSupport.c"
+#line 4143 "VideoSupport.c"
 }
 
 
@@ -4144,7 +4149,7 @@ 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 4147 "VideoSupport.c"
+#line 4152 "VideoSupport.c"
 }
 
 
@@ -4164,17 +4169,17 @@ 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 4167 "VideoSupport.c"
+#line 4172 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4171 "VideoSupport.c"
+#line 4176 "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 4177 "VideoSupport.c"
+#line 4182 "VideoSupport.c"
 	}
 }
 
@@ -4193,17 +4198,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 4196 "VideoSupport.c"
+#line 4201 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4200 "VideoSupport.c"
+#line 4205 "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 4206 "VideoSupport.c"
+#line 4211 "VideoSupport.c"
 	}
 }
 
@@ -4215,7 +4220,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 4218 "VideoSupport.c"
+#line 4223 "VideoSupport.c"
 }
 
 
@@ -4234,7 +4239,7 @@ 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 4237 "VideoSupport.c"
+#line 4242 "VideoSupport.c"
 }
 
 
@@ -4250,7 +4255,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 4253 "VideoSupport.c"
+#line 4258 "VideoSupport.c"
 }
 
 
@@ -4275,7 +4280,7 @@ gpointer video_reader_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return instance;
-#line 4278 "VideoSupport.c"
+#line 4283 "VideoSupport.c"
 }
 
 
@@ -4288,7 +4293,7 @@ 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 4291 "VideoSupport.c"
+#line 4296 "VideoSupport.c"
 	}
 }
 
@@ -4296,7 +4301,7 @@ void video_reader_unref (gpointer instance) {
 static gpointer _video_row_ref0 (gpointer self) {
 #line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? video_row_ref (self) : NULL;
-#line 4299 "VideoSupport.c"
+#line 4304 "VideoSupport.c"
 }
 
 
@@ -4343,7 +4348,7 @@ Video* video_construct (GType object_type, VideoRow* row) {
 	if ((_tmp8_ & VIDEO_FLAG_TRASH) != ((guint64) 0)) {
 #line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = TRUE;
-#line 4346 "VideoSupport.c"
+#line 4351 "VideoSupport.c"
 	} else {
 		VideoRow* _tmp9_ = NULL;
 		guint64 _tmp10_ = 0ULL;
@@ -4353,11 +4358,11 @@ Video* video_construct (GType object_type, VideoRow* row) {
 		_tmp10_ = _tmp9_->flags;
 #line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = (_tmp10_ & VIDEO_FLAG_OFFLINE) != ((guint64) 0);
-#line 4356 "VideoSupport.c"
+#line 4361 "VideoSupport.c"
 	}
 #line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp6_) {
-#line 4360 "VideoSupport.c"
+#line 4365 "VideoSupport.c"
 		VideoSourceCollection* _tmp11_ = NULL;
 		VideoRow* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
@@ -4369,18 +4374,18 @@ Video* video_construct (GType object_type, VideoRow* row) {
 		_tmp13_ = _tmp12_->backlinks;
 #line 372 "/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 4372 "VideoSupport.c"
+#line 4377 "VideoSupport.c"
 	}
 #line 365 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 4376 "VideoSupport.c"
+#line 4381 "VideoSupport.c"
 }
 
 
 Video* video_new (VideoRow* row) {
 #line 365 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_construct (TYPE_VIDEO, row);
-#line 4383 "VideoSupport.c"
+#line 4388 "VideoSupport.c"
 }
 
 
@@ -4479,7 +4484,7 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 "l video thumbnails are out of date");
 #line 394 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpreter_state_changed = TRUE;
-#line 4481 "VideoSupport.c"
+#line 4486 "VideoSupport.c"
 	} else {
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
@@ -4494,7 +4499,7 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 " may be out of date");
 #line 397 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_interpreter_state_changed = TRUE;
-#line 4495 "VideoSupport.c"
+#line 4500 "VideoSupport.c"
 		}
 	}
 #line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4507,7 +4512,7 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 	_tmp13_ = feature;
 #line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp13_ != NULL) {
-#line 4508 "VideoSupport.c"
+#line 4513 "VideoSupport.c"
 		GstRegistry* _tmp14_ = NULL;
 		GstPluginFeature* _tmp15_ = NULL;
 #line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4516,7 +4521,7 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 		_tmp15_ = feature;
 #line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		gst_registry_remove_feature (_tmp14_, _tmp15_);
-#line 4517 "VideoSupport.c"
+#line 4522 "VideoSupport.c"
 	}
 #line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp16_ = registry;
@@ -4530,7 +4535,7 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 	_tmp18_ = feature;
 #line 414 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp18_ != NULL) {
-#line 4531 "VideoSupport.c"
+#line 4536 "VideoSupport.c"
 		GstRegistry* _tmp19_ = NULL;
 		GstPluginFeature* _tmp20_ = NULL;
 #line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4539,7 +4544,7 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 		_tmp20_ = feature;
 #line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		gst_registry_remove_feature (_tmp19_, _tmp20_);
-#line 4540 "VideoSupport.c"
+#line 4545 "VideoSupport.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = video_source_collection_new ();
@@ -4560,38 +4565,38 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 #line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	all = _tmp25_;
 #line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp26_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
-	_tmp27_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
-	_tmp28_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
 	_tmp29_ = all;
 #line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
+	_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"
 	_tmp31_ = _tmp30_;
 #line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	count = _tmp31_;
-#line 4580 "VideoSupport.c"
+#line 4585 "VideoSupport.c"
 	{
 		gint ctr = 0;
 #line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		ctr = 0;
-#line 4585 "VideoSupport.c"
+#line 4590 "VideoSupport.c"
 		{
 			gboolean _tmp32_ = FALSE;
 #line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp32_ = TRUE;
 #line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 4592 "VideoSupport.c"
+#line 4597 "VideoSupport.c"
 				gint _tmp34_ = 0;
 				gint _tmp35_ = 0;
 				Video* video = NULL;
@@ -4608,13 +4613,13 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 				void* _tmp54__target = NULL;
 #line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp32_) {
-#line 4609 "VideoSupport.c"
+#line 4614 "VideoSupport.c"
 					gint _tmp33_ = 0;
 #line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp33_ = ctr;
 #line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					ctr = _tmp33_ + 1;
-#line 4615 "VideoSupport.c"
+#line 4620 "VideoSupport.c"
 				}
 #line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp32_ = FALSE;
@@ -4626,7 +4631,7 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 				if (!(_tmp34_ < _tmp35_)) {
 #line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 4627 "VideoSupport.c"
+#line 4632 "VideoSupport.c"
 				}
 #line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp36_ = all;
@@ -4648,13 +4653,13 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 				_tmp42_ = video_interpreter_state_changed;
 #line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_tmp42_) {
-#line 4649 "VideoSupport.c"
+#line 4654 "VideoSupport.c"
 					Video* _tmp43_ = NULL;
 #line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp43_ = video;
 #line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					video_set_is_interpretable (_tmp43_, FALSE);
-#line 4655 "VideoSupport.c"
+#line 4660 "VideoSupport.c"
 				}
 #line 431 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp44_ = video;
@@ -4662,7 +4667,7 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 				_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 4663 "VideoSupport.c"
+#line 4668 "VideoSupport.c"
 					GeeArrayList* _tmp46_ = NULL;
 					Video* _tmp47_ = NULL;
 #line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4671,7 +4676,7 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 					_tmp47_ = video;
 #line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp47_);
-#line 4672 "VideoSupport.c"
+#line 4677 "VideoSupport.c"
 				} else {
 					Video* _tmp48_ = NULL;
 					gboolean _tmp49_ = FALSE;
@@ -4681,7 +4686,7 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 					_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 4682 "VideoSupport.c"
+#line 4687 "VideoSupport.c"
 						GeeArrayList* _tmp50_ = NULL;
 						Video* _tmp51_ = NULL;
 #line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4690,7 +4695,7 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 						_tmp51_ = video;
 #line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp51_);
-#line 4691 "VideoSupport.c"
+#line 4696 "VideoSupport.c"
 					} else {
 						GeeArrayList* _tmp52_ = NULL;
 						Video* _tmp53_ = NULL;
@@ -4700,7 +4705,7 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 						_tmp53_ = video;
 #line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp53_);
-#line 4701 "VideoSupport.c"
+#line 4706 "VideoSupport.c"
 					}
 				}
 #line 438 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4709,7 +4714,7 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 				_tmp54__target = monitor_target;
 #line 438 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_tmp54_ != NULL) {
-#line 4710 "VideoSupport.c"
+#line 4715 "VideoSupport.c"
 					ProgressMonitor _tmp55_ = NULL;
 					void* _tmp55__target = NULL;
 					gint _tmp56_ = 0;
@@ -4724,11 +4729,11 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 					_tmp57_ = count;
 #line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp55_ ((guint64) _tmp56_, (guint64) _tmp57_, TRUE, _tmp55__target);
-#line 4725 "VideoSupport.c"
+#line 4730 "VideoSupport.c"
 				}
 #line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 4729 "VideoSupport.c"
+#line 4734 "VideoSupport.c"
 			}
 		}
 	}
@@ -4766,7 +4771,7 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 	_g_object_unref0 (feature);
 #line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (registry);
-#line 4767 "VideoSupport.c"
+#line 4772 "VideoSupport.c"
 }
 
 
@@ -4779,7 +4784,7 @@ gboolean video_has_interpreter_state_changed (void) {
 	result = _tmp0_;
 #line 448 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 4780 "VideoSupport.c"
+#line 4785 "VideoSupport.c"
 }
 
 
@@ -4793,7 +4798,7 @@ void video_notify_normal_thumbs_regenerated (void) {
 	if (_tmp0_) {
 #line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 4794 "VideoSupport.c"
+#line 4799 "VideoSupport.c"
 	}
 #line 455 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_message ("VideoSupport.vala:455: normal video thumbnail regeneration completed");
@@ -4803,23 +4808,23 @@ void video_notify_normal_thumbs_regenerated (void) {
 	_tmp2_ = video_normal_regen_complete;
 #line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 4804 "VideoSupport.c"
+#line 4809 "VideoSupport.c"
 		gboolean _tmp3_ = FALSE;
 #line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_offline_regen_complete;
 #line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp3_;
-#line 4810 "VideoSupport.c"
+#line 4815 "VideoSupport.c"
 	} else {
 #line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 4814 "VideoSupport.c"
+#line 4819 "VideoSupport.c"
 	}
 #line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_) {
 #line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_save_interpreter_state ();
-#line 4820 "VideoSupport.c"
+#line 4825 "VideoSupport.c"
 	}
 }
 
@@ -4834,7 +4839,7 @@ void video_notify_offline_thumbs_regenerated (void) {
 	if (_tmp0_) {
 #line 464 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 4835 "VideoSupport.c"
+#line 4840 "VideoSupport.c"
 	}
 #line 466 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_message ("VideoSupport.vala:466: offline video thumbnail regeneration completed");
@@ -4844,23 +4849,23 @@ void video_notify_offline_thumbs_regenerated (void) {
 	_tmp2_ = video_normal_regen_complete;
 #line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 4845 "VideoSupport.c"
+#line 4850 "VideoSupport.c"
 		gboolean _tmp3_ = FALSE;
 #line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_offline_regen_complete;
 #line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp3_;
-#line 4851 "VideoSupport.c"
+#line 4856 "VideoSupport.c"
 	} else {
 #line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 4855 "VideoSupport.c"
+#line 4860 "VideoSupport.c"
 	}
 #line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_) {
 #line 470 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_save_interpreter_state ();
-#line 4861 "VideoSupport.c"
+#line 4866 "VideoSupport.c"
 	}
 }
 
@@ -4871,7 +4876,7 @@ static void video_save_interpreter_state (void) {
 	_tmp0_ = video_interpreter_state_changed;
 #line 474 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 4872 "VideoSupport.c"
+#line 4877 "VideoSupport.c"
 		ConfigFacade* _tmp1_ = NULL;
 		ConfigFacade* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
@@ -4890,7 +4895,7 @@ static void video_save_interpreter_state (void) {
 		_g_object_unref0 (_tmp2_);
 #line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpreter_state_changed = FALSE;
-#line 4890 "VideoSupport.c"
+#line 4895 "VideoSupport.c"
 	}
 }
 
@@ -4939,13 +4944,13 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 		result = NULL;
 #line 488 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 4939 "VideoSupport.c"
+#line 4944 "VideoSupport.c"
 	}
 #line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = export_in_place;
 #line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp3_) {
-#line 4945 "VideoSupport.c"
+#line 4950 "VideoSupport.c"
 		ExporterUI* temp_exporter = NULL;
 		GeeCollection* _tmp4_ = NULL;
 		Scaling _tmp5_ = {0};
@@ -4987,7 +4992,7 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 		result = temp_exporter;
 #line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 4987 "VideoSupport.c"
+#line 4992 "VideoSupport.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = videos;
@@ -4997,7 +5002,7 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 	_tmp15_ = _tmp14_;
 #line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp15_ == 1) {
-#line 4997 "VideoSupport.c"
+#line 5002 "VideoSupport.c"
 		Video* video = NULL;
 		GFile* save_as = NULL;
 		Video* _tmp24_ = NULL;
@@ -5008,7 +5013,7 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 		GFile* _tmp29_ = NULL;
 #line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video = NULL;
-#line 5008 "VideoSupport.c"
+#line 5013 "VideoSupport.c"
 		{
 			GeeIterator* _v_it = NULL;
 			GeeCollection* _tmp16_ = NULL;
@@ -5021,7 +5026,7 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 			_v_it = _tmp17_;
 #line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 5021 "VideoSupport.c"
+#line 5026 "VideoSupport.c"
 				GeeIterator* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
 				Video* v = NULL;
@@ -5037,7 +5042,7 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 				if (!_tmp19_) {
 #line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 5037 "VideoSupport.c"
+#line 5042 "VideoSupport.c"
 				}
 #line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp20_ = _v_it;
@@ -5057,11 +5062,11 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 				_g_object_unref0 (v);
 #line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 5057 "VideoSupport.c"
+#line 5062 "VideoSupport.c"
 			}
 #line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_v_it);
-#line 5061 "VideoSupport.c"
+#line 5066 "VideoSupport.c"
 		}
 #line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp24_ = video;
@@ -5089,7 +5094,7 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 			_g_object_unref0 (video);
 #line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5089 "VideoSupport.c"
+#line 5094 "VideoSupport.c"
 		}
 		{
 			AppWindow* _tmp30_ = NULL;
@@ -5114,7 +5119,7 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 			video_export (_tmp32_, _tmp33_, &_inner_error_);
 #line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5114 "VideoSupport.c"
+#line 5119 "VideoSupport.c"
 				goto __catch500_g_error;
 			}
 #line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5125,7 +5130,7 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PAGE_WINDOW, PageWindow));
 #line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp35_);
-#line 5125 "VideoSupport.c"
+#line 5130 "VideoSupport.c"
 		}
 		goto __finally500;
 		__catch500_g_error:
@@ -5152,7 +5157,7 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 			export_error_dialog (_tmp38_, FALSE);
 #line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_error_free0 (err);
-#line 5152 "VideoSupport.c"
+#line 5157 "VideoSupport.c"
 		}
 		__finally500:
 #line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5167,7 +5172,7 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 			g_clear_error (&_inner_error_);
 #line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 5167 "VideoSupport.c"
+#line 5172 "VideoSupport.c"
 		}
 #line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
@@ -5177,7 +5182,7 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 		_g_object_unref0 (video);
 #line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5177 "VideoSupport.c"
+#line 5182 "VideoSupport.c"
 	}
 #line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp39_ = _ ("Export Videos");
@@ -5195,7 +5200,7 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 		_g_object_unref0 (export_dir);
 #line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5195 "VideoSupport.c"
+#line 5200 "VideoSupport.c"
 	}
 #line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp42_ = videos;
@@ -5231,7 +5236,7 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 	_g_object_unref0 (export_dir);
 #line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5231 "VideoSupport.c"
+#line 5236 "VideoSupport.c"
 }
 
 
@@ -5242,7 +5247,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources));
-#line 5242 "VideoSupport.c"
+#line 5247 "VideoSupport.c"
 	{
 		VideoTable* _tmp0_ = NULL;
 		VideoTable* _tmp1_ = NULL;
@@ -5264,7 +5269,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5264 "VideoSupport.c"
+#line 5269 "VideoSupport.c"
 				goto __catch501_database_error;
 			}
 #line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5273,7 +5278,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 			g_clear_error (&_inner_error_);
 #line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 5273 "VideoSupport.c"
+#line 5278 "VideoSupport.c"
 		}
 		{
 			VideoRow* _tmp4_ = NULL;
@@ -5281,7 +5286,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 			_tmp4_ = self->priv->backing_row;
 #line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5281 "VideoSupport.c"
+#line 5286 "VideoSupport.c"
 			{
 				VideoRow* _tmp5_ = NULL;
 				const gchar* _tmp6_ = NULL;
@@ -5296,7 +5301,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 				_g_free0 (_tmp5_->backlinks);
 #line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_->backlinks = _tmp7_;
-#line 5296 "VideoSupport.c"
+#line 5301 "VideoSupport.c"
 			}
 			__finally502:
 			{
@@ -5305,13 +5310,13 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 				_tmp8_ = self->priv->backing_row;
 #line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5305 "VideoSupport.c"
+#line 5310 "VideoSupport.c"
 			}
 #line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5311 "VideoSupport.c"
+#line 5316 "VideoSupport.c"
 					goto __catch501_database_error;
 				}
 #line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5320,7 +5325,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 				g_clear_error (&_inner_error_);
 #line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 5320 "VideoSupport.c"
+#line 5325 "VideoSupport.c"
 			}
 		}
 	}
@@ -5350,7 +5355,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 		_g_free0 (_tmp10_);
 #line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 5350 "VideoSupport.c"
+#line 5355 "VideoSupport.c"
 	}
 	__finally501:
 #line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5361,7 +5366,7 @@ static void video_real_commit_backlinks (DataSource* base, SourceCollection* sou
 		g_clear_error (&_inner_error_);
 #line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 5361 "VideoSupport.c"
+#line 5366 "VideoSupport.c"
 	}
 }
 
@@ -5374,14 +5379,15 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 5374 "VideoSupport.c"
+#line 5379 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
+		gboolean _tmp13_ = FALSE;
 #line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5381 "VideoSupport.c"
+#line 5387 "VideoSupport.c"
 		{
 			gboolean committed = FALSE;
 			VideoTable* _tmp1_ = NULL;
@@ -5414,7 +5420,7 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 			_tmp8_ = committed;
 #line 549 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp8_) {
-#line 5414 "VideoSupport.c"
+#line 5420 "VideoSupport.c"
 				VideoRow* _tmp9_ = NULL;
 				EventID _tmp10_ = {0};
 #line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5423,22 +5429,22 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 				_tmp10_ = *event_id;
 #line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_->event_id = _tmp10_;
-#line 5423 "VideoSupport.c"
+#line 5429 "VideoSupport.c"
 			}
 #line 552 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = committed;
-#line 5427 "VideoSupport.c"
+#line 5433 "VideoSupport.c"
 			{
 				VideoRow* _tmp11_ = NULL;
 #line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = self->priv->backing_row;
 #line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5434 "VideoSupport.c"
+#line 5440 "VideoSupport.c"
 			}
 #line 552 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5438 "VideoSupport.c"
+#line 5444 "VideoSupport.c"
 		}
 		__finally503:
 		{
@@ -5447,15 +5453,15 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 			_tmp12_ = self->priv->backing_row;
 #line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5447 "VideoSupport.c"
+#line 5453 "VideoSupport.c"
 		}
 #line 546 "/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"
 		g_clear_error (&_inner_error_);
 #line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		return FALSE;
-#line 5455 "VideoSupport.c"
+		return _tmp13_;
+#line 5461 "VideoSupport.c"
 	}
 }
 
@@ -5478,14 +5484,14 @@ gboolean video_is_duplicate (GFile* file, const gchar* full_md5) {
 	if (_tmp1_ != NULL) {
 #line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = TRUE;
-#line 5478 "VideoSupport.c"
+#line 5484 "VideoSupport.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
 #line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = full_md5;
 #line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = _tmp2_ != NULL;
-#line 5485 "VideoSupport.c"
+#line 5491 "VideoSupport.c"
 	}
 #line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_assert (_tmp0_, "file != null || full_md5 != null");
@@ -5507,7 +5513,7 @@ gboolean video_is_duplicate (GFile* file, const gchar* full_md5) {
 	result = _tmp8_;
 #line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5507 "VideoSupport.c"
+#line 5513 "VideoSupport.c"
 }
 
 
@@ -5524,7 +5530,7 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 	_g_object_unref0 (_vala_video);
 #line 566 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_video = NULL;
-#line 5524 "VideoSupport.c"
+#line 5530 "VideoSupport.c"
 	{
 		VideoID _tmp0_ = {0};
 		VideoTable* _tmp1_ = NULL;
@@ -5554,7 +5560,7 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5554 "VideoSupport.c"
+#line 5560 "VideoSupport.c"
 				goto __catch504_database_error;
 			}
 #line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5563,7 +5569,7 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 			g_clear_error (&_inner_error_);
 #line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0;
-#line 5563 "VideoSupport.c"
+#line 5569 "VideoSupport.c"
 		}
 #line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = video_id_is_invalid (&_tmp0_);
@@ -5575,15 +5581,15 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 			if (video) {
 #line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				*video = _vala_video;
-#line 5575 "VideoSupport.c"
+#line 5581 "VideoSupport.c"
 			} else {
 #line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (_vala_video);
-#line 5579 "VideoSupport.c"
+#line 5585 "VideoSupport.c"
 			}
 #line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5583 "VideoSupport.c"
+#line 5589 "VideoSupport.c"
 		}
 	}
 	goto __finally504;
@@ -5602,15 +5608,15 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 		if (video) {
 #line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*video = _vala_video;
-#line 5602 "VideoSupport.c"
+#line 5608 "VideoSupport.c"
 		} else {
 #line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_vala_video);
-#line 5606 "VideoSupport.c"
+#line 5612 "VideoSupport.c"
 		}
 #line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5610 "VideoSupport.c"
+#line 5616 "VideoSupport.c"
 	}
 	__finally504:
 #line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5621,7 +5627,7 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 		g_clear_error (&_inner_error_);
 #line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 5621 "VideoSupport.c"
+#line 5627 "VideoSupport.c"
 	}
 #line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = params;
@@ -5639,15 +5645,15 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 	if (video) {
 #line 579 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*video = _vala_video;
-#line 5639 "VideoSupport.c"
+#line 5645 "VideoSupport.c"
 	} else {
 #line 579 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_vala_video);
-#line 5643 "VideoSupport.c"
+#line 5649 "VideoSupport.c"
 	}
 #line 579 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5647 "VideoSupport.c"
+#line 5653 "VideoSupport.c"
 }
 
 
@@ -5655,7 +5661,7 @@ void video_import_failed (Video* video) {
 	GError * _inner_error_ = NULL;
 #line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (video));
-#line 5655 "VideoSupport.c"
+#line 5661 "VideoSupport.c"
 	{
 		VideoTable* _tmp0_ = NULL;
 		VideoTable* _tmp1_ = NULL;
@@ -5677,7 +5683,7 @@ void video_import_failed (Video* video) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5677 "VideoSupport.c"
+#line 5683 "VideoSupport.c"
 				goto __catch505_database_error;
 			}
 #line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5686,7 +5692,7 @@ void video_import_failed (Video* video) {
 			g_clear_error (&_inner_error_);
 #line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 5686 "VideoSupport.c"
+#line 5692 "VideoSupport.c"
 		}
 	}
 	goto __finally505;
@@ -5704,7 +5710,7 @@ void video_import_failed (Video* video) {
 		app_window_database_error (_tmp4_);
 #line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 5704 "VideoSupport.c"
+#line 5710 "VideoSupport.c"
 	}
 	__finally505:
 #line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5715,7 +5721,7 @@ void video_import_failed (Video* video) {
 		g_clear_error (&_inner_error_);
 #line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 5715 "VideoSupport.c"
+#line 5721 "VideoSupport.c"
 	}
 }
 
@@ -5740,14 +5746,14 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 	backing_length1 = 1;
 #line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_backing_size_ = backing_length1;
-#line 5740 "VideoSupport.c"
+#line 5746 "VideoSupport.c"
 	{
 		VideoRow* _tmp1_ = NULL;
 #line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->priv->backing_row;
 #line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5747 "VideoSupport.c"
+#line 5753 "VideoSupport.c"
 		{
 			VideoRow* _tmp2_ = NULL;
 			const gchar* _tmp3_ = NULL;
@@ -5783,7 +5789,7 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 			backing[0] = _tmp10_;
 #line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = backing[0];
-#line 5783 "VideoSupport.c"
+#line 5789 "VideoSupport.c"
 		}
 		__finally506:
 		{
@@ -5792,7 +5798,7 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 			_tmp12_ = self->priv->backing_row;
 #line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5792 "VideoSupport.c"
+#line 5798 "VideoSupport.c"
 		}
 #line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5804,7 +5810,7 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 			g_clear_error (&_inner_error_);
 #line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 5804 "VideoSupport.c"
+#line 5810 "VideoSupport.c"
 		}
 	}
 #line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -5815,13 +5821,13 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 	if (result_length1) {
 #line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*result_length1 = _tmp13__length1;
-#line 5815 "VideoSupport.c"
+#line 5821 "VideoSupport.c"
 	}
 #line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp13_;
 #line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5821 "VideoSupport.c"
+#line 5827 "VideoSupport.c"
 }
 
 
@@ -5847,7 +5853,7 @@ static GdkPixbuf* video_real_get_thumbnail (ThumbnailSource* base, gint scale, G
 		g_propagate_error (error, _inner_error_);
 #line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5847 "VideoSupport.c"
+#line 5853 "VideoSupport.c"
 	}
 #line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp0_;
@@ -5859,7 +5865,7 @@ static GdkPixbuf* video_real_get_thumbnail (ThumbnailSource* base, gint scale, G
 	_g_object_unref0 (_tmp0_);
 #line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5859 "VideoSupport.c"
+#line 5865 "VideoSupport.c"
 }
 
 
@@ -5869,14 +5875,14 @@ static gchar* video_real_get_master_md5 (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 5869 "VideoSupport.c"
+#line 5875 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
 #line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5876 "VideoSupport.c"
+#line 5882 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
@@ -5889,18 +5895,18 @@ static gchar* video_real_get_master_md5 (MediaSource* base) {
 			_tmp3_ = g_strdup (_tmp2_);
 #line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 5889 "VideoSupport.c"
+#line 5895 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_ = NULL;
 #line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
 #line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5896 "VideoSupport.c"
+#line 5902 "VideoSupport.c"
 			}
 #line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5900 "VideoSupport.c"
+#line 5906 "VideoSupport.c"
 		}
 		__finally507:
 		{
@@ -5909,7 +5915,7 @@ static gchar* video_real_get_master_md5 (MediaSource* base) {
 			_tmp5_ = self->priv->backing_row;
 #line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5909 "VideoSupport.c"
+#line 5915 "VideoSupport.c"
 		}
 #line 605 "/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);
@@ -5917,7 +5923,7 @@ static gchar* video_real_get_master_md5 (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5917 "VideoSupport.c"
+#line 5923 "VideoSupport.c"
 	}
 }
 
@@ -5943,7 +5949,7 @@ static GdkPixbuf* video_real_get_preview_pixbuf (MediaSource* base, Scaling* sca
 		g_propagate_error (error, _inner_error_);
 #line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5943 "VideoSupport.c"
+#line 5949 "VideoSupport.c"
 	}
 #line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = scaling_perform_on_pixbuf (scaling, pixbuf, GDK_INTERP_NEAREST, TRUE);
@@ -5953,7 +5959,7 @@ static GdkPixbuf* video_real_get_preview_pixbuf (MediaSource* base, Scaling* sca
 	_g_object_unref0 (pixbuf);
 #line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5953 "VideoSupport.c"
+#line 5959 "VideoSupport.c"
 }
 
 
@@ -5994,7 +6000,7 @@ static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale
 	_tmp7_ = frame;
 #line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp7_ != NULL) {
-#line 5994 "VideoSupport.c"
+#line 6000 "VideoSupport.c"
 		GdkPixbuf* _tmp8_ = NULL;
 		GdkPixbuf* _tmp9_ = NULL;
 #line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6005,7 +6011,7 @@ static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale
 		_g_object_unref0 (_tmp6_);
 #line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp9_;
-#line 6005 "VideoSupport.c"
+#line 6011 "VideoSupport.c"
 	} else {
 		GdkPixbuf* _tmp10_ = NULL;
 		GdkPixbuf* _tmp11_ = NULL;
@@ -6022,7 +6028,7 @@ static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale
 		_tmp6_ = _tmp12_;
 #line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp11_);
-#line 6022 "VideoSupport.c"
+#line 6028 "VideoSupport.c"
 	}
 #line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp6_;
@@ -6032,7 +6038,7 @@ static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale
 	_video_reader_unref0 (reader);
 #line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6032 "VideoSupport.c"
+#line 6038 "VideoSupport.c"
 }
 
 
@@ -6048,7 +6054,7 @@ static gchar* video_real_get_typename (DataSource* base) {
 	result = _tmp0_;
 #line 624 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6048 "VideoSupport.c"
+#line 6054 "VideoSupport.c"
 }
 
 
@@ -6067,7 +6073,7 @@ static gint64 video_real_get_instance_id (DataSource* base) {
 	result = _tmp1_;
 #line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6067 "VideoSupport.c"
+#line 6073 "VideoSupport.c"
 }
 
 
@@ -6076,14 +6082,14 @@ static void video_real_get_import_id (MediaSource* base, ImportID* result) {
 	GError * _inner_error_ = NULL;
 #line 631 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6076 "VideoSupport.c"
+#line 6082 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
 #line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6083 "VideoSupport.c"
+#line 6089 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			ImportID _tmp2_ = {0};
@@ -6093,18 +6099,18 @@ static void video_real_get_import_id (MediaSource* base, ImportID* result) {
 			_tmp2_ = _tmp1_->import_id;
 #line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 6093 "VideoSupport.c"
+#line 6099 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
 #line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
 #line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6100 "VideoSupport.c"
+#line 6106 "VideoSupport.c"
 			}
 #line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6104 "VideoSupport.c"
+#line 6110 "VideoSupport.c"
 		}
 		__finally508:
 		{
@@ -6113,7 +6119,7 @@ static void video_real_get_import_id (MediaSource* base, ImportID* result) {
 			_tmp4_ = self->priv->backing_row;
 #line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6113 "VideoSupport.c"
+#line 6119 "VideoSupport.c"
 		}
 #line 632 "/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);
@@ -6121,7 +6127,7 @@ static void video_real_get_import_id (MediaSource* base, ImportID* result) {
 		g_clear_error (&_inner_error_);
 #line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 6121 "VideoSupport.c"
+#line 6127 "VideoSupport.c"
 	}
 }
 
@@ -6138,7 +6144,7 @@ static PhotoFileFormat video_real_get_preferred_thumbnail_format (ThumbnailSourc
 	result = _tmp0_;
 #line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6138 "VideoSupport.c"
+#line 6144 "VideoSupport.c"
 }
 
 
@@ -6148,14 +6154,14 @@ static gchar* video_real_get_title (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 641 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6148 "VideoSupport.c"
+#line 6154 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
 #line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6155 "VideoSupport.c"
+#line 6161 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
@@ -6168,18 +6174,18 @@ static gchar* video_real_get_title (MediaSource* base) {
 			_tmp3_ = g_strdup (_tmp2_);
 #line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 6168 "VideoSupport.c"
+#line 6174 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_ = NULL;
 #line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
 #line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6175 "VideoSupport.c"
+#line 6181 "VideoSupport.c"
 			}
 #line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6179 "VideoSupport.c"
+#line 6185 "VideoSupport.c"
 		}
 		__finally509:
 		{
@@ -6188,7 +6194,7 @@ static gchar* video_real_get_title (MediaSource* base) {
 			_tmp5_ = self->priv->backing_row;
 #line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6188 "VideoSupport.c"
+#line 6194 "VideoSupport.c"
 		}
 #line 642 "/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);
@@ -6196,7 +6202,7 @@ static gchar* video_real_get_title (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 6196 "VideoSupport.c"
+#line 6202 "VideoSupport.c"
 	}
 }
 
@@ -6217,14 +6223,14 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 	_tmp1_ = media_source_prep_title (_tmp0_);
 #line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	new_title = _tmp1_;
-#line 6217 "VideoSupport.c"
+#line 6223 "VideoSupport.c"
 	{
 		VideoRow* _tmp2_ = NULL;
 #line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = self->priv->backing_row;
 #line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6224 "VideoSupport.c"
+#line 6230 "VideoSupport.c"
 		{
 			VideoRow* _tmp3_ = NULL;
 			const gchar* _tmp4_ = NULL;
@@ -6240,20 +6246,20 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 			_tmp5_ = new_title;
 #line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 6240 "VideoSupport.c"
+#line 6246 "VideoSupport.c"
 				{
 					VideoRow* _tmp6_ = NULL;
 #line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp6_ = self->priv->backing_row;
 #line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6247 "VideoSupport.c"
+#line 6253 "VideoSupport.c"
 				}
 #line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
 #line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6253 "VideoSupport.c"
+#line 6259 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp7_ = NULL;
@@ -6279,7 +6285,7 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6279 "VideoSupport.c"
+#line 6285 "VideoSupport.c"
 						goto __catch511_database_error;
 					}
 					{
@@ -6288,7 +6294,7 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 						_tmp12_ = self->priv->backing_row;
 #line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6288 "VideoSupport.c"
+#line 6294 "VideoSupport.c"
 					}
 #line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_title);
@@ -6298,7 +6304,7 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 					g_clear_error (&_inner_error_);
 #line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 6298 "VideoSupport.c"
+#line 6304 "VideoSupport.c"
 				}
 			}
 			goto __finally511;
@@ -6316,32 +6322,32 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 				app_window_database_error (_tmp13_);
 #line 658 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6316 "VideoSupport.c"
+#line 6322 "VideoSupport.c"
 				{
 					VideoRow* _tmp14_ = NULL;
 #line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp14_ = self->priv->backing_row;
 #line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6323 "VideoSupport.c"
+#line 6329 "VideoSupport.c"
 				}
 #line 658 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
 #line 658 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6329 "VideoSupport.c"
+#line 6335 "VideoSupport.c"
 			}
 			__finally511:
 #line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6334 "VideoSupport.c"
+#line 6340 "VideoSupport.c"
 				{
 					VideoRow* _tmp15_ = NULL;
 #line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp15_ = self->priv->backing_row;
 #line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6341 "VideoSupport.c"
+#line 6347 "VideoSupport.c"
 				}
 #line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
@@ -6351,7 +6357,7 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 				g_clear_error (&_inner_error_);
 #line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6351 "VideoSupport.c"
+#line 6357 "VideoSupport.c"
 			}
 #line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = self->priv->backing_row;
@@ -6363,7 +6369,7 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 			_g_free0 (_tmp16_->title);
 #line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_->title = _tmp18_;
-#line 6363 "VideoSupport.c"
+#line 6369 "VideoSupport.c"
 		}
 		__finally510:
 		{
@@ -6372,7 +6378,7 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 			_tmp19_ = self->priv->backing_row;
 #line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6372 "VideoSupport.c"
+#line 6378 "VideoSupport.c"
 		}
 #line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -6384,7 +6390,7 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 			g_clear_error (&_inner_error_);
 #line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6384 "VideoSupport.c"
+#line 6390 "VideoSupport.c"
 		}
 	}
 #line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6397,7 +6403,7 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 	_alteration_unref0 (_tmp21_);
 #line 647 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_title);
-#line 6397 "VideoSupport.c"
+#line 6403 "VideoSupport.c"
 }
 
 
@@ -6407,14 +6413,14 @@ static gchar* video_real_get_comment (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 668 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6407 "VideoSupport.c"
+#line 6413 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
 #line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6414 "VideoSupport.c"
+#line 6420 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
@@ -6427,18 +6433,18 @@ static gchar* video_real_get_comment (MediaSource* base) {
 			_tmp3_ = g_strdup (_tmp2_);
 #line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 6427 "VideoSupport.c"
+#line 6433 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_ = NULL;
 #line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
 #line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6434 "VideoSupport.c"
+#line 6440 "VideoSupport.c"
 			}
 #line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6438 "VideoSupport.c"
+#line 6444 "VideoSupport.c"
 		}
 		__finally512:
 		{
@@ -6447,7 +6453,7 @@ static gchar* video_real_get_comment (MediaSource* base) {
 			_tmp5_ = self->priv->backing_row;
 #line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6447 "VideoSupport.c"
+#line 6453 "VideoSupport.c"
 		}
 #line 669 "/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);
@@ -6455,7 +6461,7 @@ static gchar* video_real_get_comment (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 6455 "VideoSupport.c"
+#line 6461 "VideoSupport.c"
 	}
 }
 
@@ -6466,8 +6472,8 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 	gchar* new_comment = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-	Alteration* _tmp20_ = NULL;
-	Alteration* _tmp21_ = NULL;
+	Alteration* _tmp23_ = NULL;
+	Alteration* _tmp24_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 674 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
@@ -6477,21 +6483,21 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 	_tmp1_ = media_source_prep_title (_tmp0_);
 #line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	new_comment = _tmp1_;
-#line 6477 "VideoSupport.c"
+#line 6483 "VideoSupport.c"
 	{
 		VideoRow* _tmp2_ = NULL;
 #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = self->priv->backing_row;
 #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6484 "VideoSupport.c"
+#line 6490 "VideoSupport.c"
 		{
 			VideoRow* _tmp3_ = NULL;
 			const gchar* _tmp4_ = NULL;
 			const gchar* _tmp5_ = NULL;
-			VideoRow* _tmp16_ = NULL;
-			const gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
+			VideoRow* _tmp18_ = NULL;
+			const gchar* _tmp19_ = NULL;
+			gchar* _tmp20_ = NULL;
 #line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
 #line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6502,20 +6508,20 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 			if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
 #line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = TRUE;
-#line 6502 "VideoSupport.c"
+#line 6508 "VideoSupport.c"
 				{
 					VideoRow* _tmp6_ = NULL;
 #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp6_ = self->priv->backing_row;
 #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6509 "VideoSupport.c"
+#line 6515 "VideoSupport.c"
 				}
 #line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
 #line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 6515 "VideoSupport.c"
+#line 6521 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp7_ = NULL;
@@ -6539,9 +6545,11 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 				_database_table_unref0 (_tmp8_);
 #line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 6545 "VideoSupport.c"
+					gboolean _tmp13_ = FALSE;
 #line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6541 "VideoSupport.c"
+#line 6549 "VideoSupport.c"
 						goto __catch514_database_error;
 					}
 					{
@@ -6550,7 +6558,7 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 						_tmp12_ = self->priv->backing_row;
 #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6550 "VideoSupport.c"
+#line 6558 "VideoSupport.c"
 					}
 #line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_comment);
@@ -6559,53 +6567,54 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 #line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
 #line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					return FALSE;
-#line 6560 "VideoSupport.c"
+					return _tmp13_;
+#line 6568 "VideoSupport.c"
 				}
 			}
 			goto __finally514;
 			__catch514_database_error:
 			{
 				GError* e = NULL;
-				GError* _tmp13_ = NULL;
+				GError* _tmp14_ = NULL;
 #line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
 #line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
 #line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp13_ = e;
+				_tmp14_ = e;
 #line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				app_window_database_error (_tmp13_);
+				app_window_database_error (_tmp14_);
 #line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = FALSE;
 #line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6580 "VideoSupport.c"
+#line 6588 "VideoSupport.c"
 				{
-					VideoRow* _tmp14_ = NULL;
+					VideoRow* _tmp15_ = NULL;
 #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp14_ = self->priv->backing_row;
+					_tmp15_ = self->priv->backing_row;
 #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6587 "VideoSupport.c"
+#line 6595 "VideoSupport.c"
 				}
 #line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
 #line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 6593 "VideoSupport.c"
+#line 6601 "VideoSupport.c"
 			}
 			__finally514:
 #line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6598 "VideoSupport.c"
+#line 6606 "VideoSupport.c"
+				gboolean _tmp17_ = FALSE;
 				{
-					VideoRow* _tmp15_ = NULL;
+					VideoRow* _tmp16_ = NULL;
 #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp15_ = self->priv->backing_row;
+					_tmp16_ = self->priv->backing_row;
 #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6605 "VideoSupport.c"
+#line 6614 "VideoSupport.c"
 				}
 #line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
@@ -6614,32 +6623,34 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 #line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
 #line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				return FALSE;
-#line 6615 "VideoSupport.c"
+				return _tmp17_;
+#line 6624 "VideoSupport.c"
 			}
 #line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp16_ = self->priv->backing_row;
+			_tmp18_ = self->priv->backing_row;
 #line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp17_ = new_comment;
+			_tmp19_ = new_comment;
 #line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp18_ = g_strdup (_tmp17_);
+			_tmp20_ = g_strdup (_tmp19_);
 #line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_g_free0 (_tmp16_->comment);
+			_g_free0 (_tmp18_->comment);
 #line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp16_->comment = _tmp18_;
-#line 6627 "VideoSupport.c"
+			_tmp18_->comment = _tmp20_;
+#line 6636 "VideoSupport.c"
 		}
 		__finally513:
 		{
-			VideoRow* _tmp19_ = NULL;
+			VideoRow* _tmp21_ = NULL;
 #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp19_ = self->priv->backing_row;
+			_tmp21_ = self->priv->backing_row;
 #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6636 "VideoSupport.c"
+#line 6645 "VideoSupport.c"
 		}
 #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 6649 "VideoSupport.c"
+			gboolean _tmp22_ = FALSE;
 #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (new_comment);
 #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6647,25 +6658,25 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
 #line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			return FALSE;
-#line 6648 "VideoSupport.c"
+			return _tmp22_;
+#line 6659 "VideoSupport.c"
 		}
 	}
 #line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp20_ = alteration_new ("metadata", "comment");
+	_tmp23_ = alteration_new ("metadata", "comment");
 #line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp21_ = _tmp20_;
+	_tmp24_ = _tmp23_;
 #line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_);
+	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp24_);
 #line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_alteration_unref0 (_tmp21_);
+	_alteration_unref0 (_tmp24_);
 #line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = TRUE;
 #line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_comment);
 #line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6665 "VideoSupport.c"
+#line 6676 "VideoSupport.c"
 }
 
 
@@ -6675,14 +6686,14 @@ static Rating video_real_get_rating (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 698 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6675 "VideoSupport.c"
+#line 6686 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
 #line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6682 "VideoSupport.c"
+#line 6693 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
@@ -6692,18 +6703,18 @@ static Rating video_real_get_rating (MediaSource* base) {
 			_tmp2_ = _tmp1_->rating;
 #line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 6692 "VideoSupport.c"
+#line 6703 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
 #line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
 #line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6699 "VideoSupport.c"
+#line 6710 "VideoSupport.c"
 			}
 #line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6703 "VideoSupport.c"
+#line 6714 "VideoSupport.c"
 		}
 		__finally515:
 		{
@@ -6712,7 +6723,7 @@ static Rating video_real_get_rating (MediaSource* base) {
 			_tmp4_ = self->priv->backing_row;
 #line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6712 "VideoSupport.c"
+#line 6723 "VideoSupport.c"
 		}
 #line 699 "/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);
@@ -6720,7 +6731,7 @@ static Rating video_real_get_rating (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 6720 "VideoSupport.c"
+#line 6731 "VideoSupport.c"
 	}
 }
 
@@ -6732,14 +6743,14 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 	GError * _inner_error_ = NULL;
 #line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6732 "VideoSupport.c"
+#line 6743 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
 #line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6739 "VideoSupport.c"
+#line 6750 "VideoSupport.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			Rating _tmp2_ = 0;
@@ -6754,7 +6765,7 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 			if (!_tmp3_) {
 #line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = TRUE;
-#line 6754 "VideoSupport.c"
+#line 6765 "VideoSupport.c"
 			} else {
 				Rating _tmp4_ = 0;
 				VideoRow* _tmp5_ = NULL;
@@ -6767,22 +6778,22 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 				_tmp6_ = _tmp5_->rating;
 #line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = _tmp4_ == _tmp6_;
-#line 6767 "VideoSupport.c"
+#line 6778 "VideoSupport.c"
 			}
 #line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp1_) {
-#line 6771 "VideoSupport.c"
+#line 6782 "VideoSupport.c"
 				{
 					VideoRow* _tmp7_ = NULL;
 #line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp7_ = self->priv->backing_row;
 #line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6778 "VideoSupport.c"
+#line 6789 "VideoSupport.c"
 				}
 #line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6782 "VideoSupport.c"
+#line 6793 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp8_ = NULL;
@@ -6805,7 +6816,7 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6805 "VideoSupport.c"
+#line 6816 "VideoSupport.c"
 						goto __catch517_database_error;
 					}
 					{
@@ -6814,7 +6825,7 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 						_tmp12_ = self->priv->backing_row;
 #line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6814 "VideoSupport.c"
+#line 6825 "VideoSupport.c"
 					}
 #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);
@@ -6822,7 +6833,7 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 					g_clear_error (&_inner_error_);
 #line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 6822 "VideoSupport.c"
+#line 6833 "VideoSupport.c"
 				}
 			}
 			goto __finally517;
@@ -6840,30 +6851,30 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 				app_window_database_error (_tmp13_);
 #line 713 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6840 "VideoSupport.c"
+#line 6851 "VideoSupport.c"
 				{
 					VideoRow* _tmp14_ = NULL;
 #line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp14_ = self->priv->backing_row;
 #line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6847 "VideoSupport.c"
+#line 6858 "VideoSupport.c"
 				}
 #line 713 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6851 "VideoSupport.c"
+#line 6862 "VideoSupport.c"
 			}
 			__finally517:
 #line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6856 "VideoSupport.c"
+#line 6867 "VideoSupport.c"
 				{
 					VideoRow* _tmp15_ = NULL;
 #line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp15_ = self->priv->backing_row;
 #line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6863 "VideoSupport.c"
+#line 6874 "VideoSupport.c"
 				}
 #line 709 "/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);
@@ -6871,7 +6882,7 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 				g_clear_error (&_inner_error_);
 #line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6871 "VideoSupport.c"
+#line 6882 "VideoSupport.c"
 			}
 #line 717 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = self->priv->backing_row;
@@ -6879,7 +6890,7 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 			_tmp17_ = rating;
 #line 717 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_->rating = _tmp17_;
-#line 6879 "VideoSupport.c"
+#line 6890 "VideoSupport.c"
 		}
 		__finally516:
 		{
@@ -6888,7 +6899,7 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 			_tmp18_ = self->priv->backing_row;
 #line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6888 "VideoSupport.c"
+#line 6899 "VideoSupport.c"
 		}
 #line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -6898,7 +6909,7 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 			g_clear_error (&_inner_error_);
 #line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6898 "VideoSupport.c"
+#line 6909 "VideoSupport.c"
 		}
 	}
 #line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -6909,7 +6920,7 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
 #line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp20_);
-#line 6909 "VideoSupport.c"
+#line 6920 "VideoSupport.c"
 }
 
 
@@ -6918,14 +6929,14 @@ static void video_real_increase_rating (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 723 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6918 "VideoSupport.c"
+#line 6929 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
 #line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6925 "VideoSupport.c"
+#line 6936 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
@@ -6938,7 +6949,7 @@ static void video_real_increase_rating (MediaSource* base) {
 			_tmp3_ = rating_increase (_tmp2_);
 #line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 6938 "VideoSupport.c"
+#line 6949 "VideoSupport.c"
 		}
 		__finally518:
 		{
@@ -6947,7 +6958,7 @@ static void video_real_increase_rating (MediaSource* base) {
 			_tmp4_ = self->priv->backing_row;
 #line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6947 "VideoSupport.c"
+#line 6958 "VideoSupport.c"
 		}
 #line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -6957,7 +6968,7 @@ static void video_real_increase_rating (MediaSource* base) {
 			g_clear_error (&_inner_error_);
 #line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6957 "VideoSupport.c"
+#line 6968 "VideoSupport.c"
 		}
 	}
 }
@@ -6968,14 +6979,14 @@ static void video_real_decrease_rating (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 729 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6968 "VideoSupport.c"
+#line 6979 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
 #line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6975 "VideoSupport.c"
+#line 6986 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
@@ -6988,7 +6999,7 @@ static void video_real_decrease_rating (MediaSource* base) {
 			_tmp3_ = rating_decrease (_tmp2_);
 #line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 6988 "VideoSupport.c"
+#line 6999 "VideoSupport.c"
 		}
 		__finally519:
 		{
@@ -6997,7 +7008,7 @@ static void video_real_decrease_rating (MediaSource* base) {
 			_tmp4_ = self->priv->backing_row;
 #line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6997 "VideoSupport.c"
+#line 7008 "VideoSupport.c"
 		}
 #line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -7007,7 +7018,7 @@ static void video_real_decrease_rating (MediaSource* base) {
 			g_clear_error (&_inner_error_);
 #line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7007 "VideoSupport.c"
+#line 7018 "VideoSupport.c"
 		}
 	}
 }
@@ -7025,7 +7036,7 @@ static gboolean video_real_is_trashed (MediaSource* base) {
 	result = _tmp0_;
 #line 736 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7025 "VideoSupport.c"
+#line 7036 "VideoSupport.c"
 }
 
 
@@ -7041,7 +7052,7 @@ static gboolean video_real_is_offline (Monitorable* base) {
 	result = _tmp0_;
 #line 740 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7041 "VideoSupport.c"
+#line 7052 "VideoSupport.c"
 }
 
 
@@ -7051,7 +7062,7 @@ static void video_real_mark_offline (Monitorable* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 744 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_OFFLINE, NULL);
-#line 7051 "VideoSupport.c"
+#line 7062 "VideoSupport.c"
 }
 
 
@@ -7067,21 +7078,21 @@ static void video_real_mark_online (Monitorable* base) {
 	_tmp1_ = video_get_is_interpretable (self);
 #line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!_tmp1_) {
-#line 7067 "VideoSupport.c"
+#line 7078 "VideoSupport.c"
 		gboolean _tmp2_ = FALSE;
 #line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = video_has_interpreter_state_changed ();
 #line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = _tmp2_;
-#line 7073 "VideoSupport.c"
+#line 7084 "VideoSupport.c"
 	} else {
 #line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = FALSE;
-#line 7077 "VideoSupport.c"
+#line 7088 "VideoSupport.c"
 	}
 #line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 7081 "VideoSupport.c"
+#line 7092 "VideoSupport.c"
 		VideoInterpretableResults* _tmp3_ = NULL;
 		VideoInterpretableResults* _tmp4_ = NULL;
 #line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7092,7 +7103,7 @@ static void video_real_mark_online (Monitorable* base) {
 		video_interpretable_results_foreground_finish (_tmp4_);
 #line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_interpretable_results_unref0 (_tmp4_);
-#line 7092 "VideoSupport.c"
+#line 7103 "VideoSupport.c"
 	}
 }
 
@@ -7103,7 +7114,7 @@ static void video_real_trash (MediaSource* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_TRASH, NULL);
-#line 7103 "VideoSupport.c"
+#line 7114 "VideoSupport.c"
 }
 
 
@@ -7113,7 +7124,7 @@ static void video_real_untrash (MediaSource* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
 #line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_remove_flags (self, VIDEO_FLAG_TRASH, NULL);
-#line 7113 "VideoSupport.c"
+#line 7124 "VideoSupport.c"
 }
 
 
@@ -7129,7 +7140,7 @@ static gboolean video_real_is_flagged (Flaggable* base) {
 	result = _tmp0_;
 #line 763 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7129 "VideoSupport.c"
+#line 7140 "VideoSupport.c"
 }
 
 
@@ -7147,7 +7158,7 @@ static void video_real_mark_flagged (Flaggable* base) {
 	video_add_flags (self, VIDEO_FLAG_FLAGGED, _tmp1_);
 #line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp1_);
-#line 7147 "VideoSupport.c"
+#line 7158 "VideoSupport.c"
 }
 
 
@@ -7165,7 +7176,7 @@ static void video_real_mark_unflagged (Flaggable* base) {
 	video_remove_flags (self, VIDEO_FLAG_FLAGGED, _tmp1_);
 #line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp1_);
-#line 7165 "VideoSupport.c"
+#line 7176 "VideoSupport.c"
 }
 
 
@@ -7174,14 +7185,14 @@ static void video_real_get_event_id (MediaSource* base, EventID* result) {
 	GError * _inner_error_ = NULL;
 #line 774 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7174 "VideoSupport.c"
+#line 7185 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
 #line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7181 "VideoSupport.c"
+#line 7192 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			EventID _tmp2_ = {0};
@@ -7191,18 +7202,18 @@ static void video_real_get_event_id (MediaSource* base, EventID* result) {
 			_tmp2_ = _tmp1_->event_id;
 #line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 7191 "VideoSupport.c"
+#line 7202 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
 #line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
 #line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7198 "VideoSupport.c"
+#line 7209 "VideoSupport.c"
 			}
 #line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7202 "VideoSupport.c"
+#line 7213 "VideoSupport.c"
 		}
 		__finally520:
 		{
@@ -7211,7 +7222,7 @@ static void video_real_get_event_id (MediaSource* base, EventID* result) {
 			_tmp4_ = self->priv->backing_row;
 #line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7211 "VideoSupport.c"
+#line 7222 "VideoSupport.c"
 		}
 #line 775 "/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);
@@ -7219,7 +7230,7 @@ static void video_real_get_event_id (MediaSource* base, EventID* result) {
 		g_clear_error (&_inner_error_);
 #line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7219 "VideoSupport.c"
+#line 7230 "VideoSupport.c"
 	}
 }
 
@@ -7230,14 +7241,14 @@ static gchar* video_real_to_string (DataObject* base) {
 	GError * _inner_error_ = NULL;
 #line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7230 "VideoSupport.c"
+#line 7241 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
 #line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7237 "VideoSupport.c"
+#line 7248 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			VideoID _tmp2_ = {0};
@@ -7270,18 +7281,18 @@ static gchar* video_real_to_string (DataObject* base) {
 			_g_free0 (_tmp5_);
 #line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp9_;
-#line 7270 "VideoSupport.c"
+#line 7281 "VideoSupport.c"
 			{
 				VideoRow* _tmp10_ = NULL;
 #line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = self->priv->backing_row;
 #line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7277 "VideoSupport.c"
+#line 7288 "VideoSupport.c"
 			}
 #line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7281 "VideoSupport.c"
+#line 7292 "VideoSupport.c"
 		}
 		__finally521:
 		{
@@ -7290,7 +7301,7 @@ static gchar* video_real_to_string (DataObject* base) {
 			_tmp11_ = self->priv->backing_row;
 #line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7290 "VideoSupport.c"
+#line 7301 "VideoSupport.c"
 		}
 #line 781 "/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);
@@ -7298,7 +7309,7 @@ static gchar* video_real_to_string (DataObject* base) {
 		g_clear_error (&_inner_error_);
 #line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 7298 "VideoSupport.c"
+#line 7309 "VideoSupport.c"
 	}
 }
 
@@ -7307,14 +7318,14 @@ void video_get_video_id (Video* self, VideoID* result) {
 	GError * _inner_error_ = NULL;
 #line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 7307 "VideoSupport.c"
+#line 7318 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
 #line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7314 "VideoSupport.c"
+#line 7325 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			VideoID _tmp2_ = {0};
@@ -7324,18 +7335,18 @@ void video_get_video_id (Video* self, VideoID* result) {
 			_tmp2_ = _tmp1_->video_id;
 #line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 7324 "VideoSupport.c"
+#line 7335 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
 #line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
 #line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7331 "VideoSupport.c"
+#line 7342 "VideoSupport.c"
 			}
 #line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7335 "VideoSupport.c"
+#line 7346 "VideoSupport.c"
 		}
 		__finally522:
 		{
@@ -7344,7 +7355,7 @@ void video_get_video_id (Video* self, VideoID* result) {
 			_tmp4_ = self->priv->backing_row;
 #line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7344 "VideoSupport.c"
+#line 7355 "VideoSupport.c"
 		}
 #line 787 "/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);
@@ -7352,7 +7363,7 @@ void video_get_video_id (Video* self, VideoID* result) {
 		g_clear_error (&_inner_error_);
 #line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7352 "VideoSupport.c"
+#line 7363 "VideoSupport.c"
 	}
 }
 
@@ -7363,14 +7374,15 @@ static time_t video_real_get_exposure_time (Dateable* base) {
 	GError * _inner_error_ = NULL;
 #line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7363 "VideoSupport.c"
+#line 7374 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
+		time_t _tmp5_ = 0;
 #line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7370 "VideoSupport.c"
+#line 7382 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			time_t _tmp2_ = 0;
@@ -7380,18 +7392,18 @@ static time_t video_real_get_exposure_time (Dateable* base) {
 			_tmp2_ = _tmp1_->exposure_time;
 #line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7380 "VideoSupport.c"
+#line 7392 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
 #line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
 #line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7387 "VideoSupport.c"
+#line 7399 "VideoSupport.c"
 			}
 #line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7391 "VideoSupport.c"
+#line 7403 "VideoSupport.c"
 		}
 		__finally523:
 		{
@@ -7400,15 +7412,15 @@ static time_t video_real_get_exposure_time (Dateable* base) {
 			_tmp4_ = self->priv->backing_row;
 #line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7400 "VideoSupport.c"
+#line 7412 "VideoSupport.c"
 		}
 #line 793 "/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"
 		g_clear_error (&_inner_error_);
 #line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		return 0;
-#line 7408 "VideoSupport.c"
+		return _tmp5_;
+#line 7420 "VideoSupport.c"
 	}
 }
 
@@ -7420,14 +7432,14 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 	GError * _inner_error_ = NULL;
 #line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7420 "VideoSupport.c"
+#line 7432 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
 #line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7427 "VideoSupport.c"
+#line 7439 "VideoSupport.c"
 		{
 			VideoRow* _tmp9_ = NULL;
 			time_t _tmp10_ = 0;
@@ -7453,7 +7465,7 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 				_database_table_unref0 (_tmp2_);
 #line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7453 "VideoSupport.c"
+#line 7465 "VideoSupport.c"
 					goto __catch525_g_error;
 				}
 			}
@@ -7475,19 +7487,19 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 				g_debug ("VideoSupport.vala:803: Warning - %s", _tmp7_);
 #line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 7475 "VideoSupport.c"
+#line 7487 "VideoSupport.c"
 			}
 			__finally525:
 #line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7480 "VideoSupport.c"
+#line 7492 "VideoSupport.c"
 				{
 					VideoRow* _tmp8_ = NULL;
 #line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp8_ = self->priv->backing_row;
 #line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7487 "VideoSupport.c"
+#line 7499 "VideoSupport.c"
 				}
 #line 800 "/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);
@@ -7495,7 +7507,7 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 				g_clear_error (&_inner_error_);
 #line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 7495 "VideoSupport.c"
+#line 7507 "VideoSupport.c"
 			}
 #line 805 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = self->priv->backing_row;
@@ -7503,7 +7515,7 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 			_tmp10_ = time;
 #line 805 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_->exposure_time = _tmp10_;
-#line 7503 "VideoSupport.c"
+#line 7515 "VideoSupport.c"
 		}
 		__finally524:
 		{
@@ -7512,7 +7524,7 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 			_tmp11_ = self->priv->backing_row;
 #line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7512 "VideoSupport.c"
+#line 7524 "VideoSupport.c"
 		}
 #line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -7522,7 +7534,7 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 			g_clear_error (&_inner_error_);
 #line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7522 "VideoSupport.c"
+#line 7534 "VideoSupport.c"
 		}
 	}
 #line 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7533,7 +7545,7 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_);
 #line 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp13_);
-#line 7533 "VideoSupport.c"
+#line 7545 "VideoSupport.c"
 }
 
 
@@ -7541,14 +7553,14 @@ void video_get_frame_dimensions (Video* self, Dimensions* result) {
 	GError * _inner_error_ = NULL;
 #line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 7541 "VideoSupport.c"
+#line 7553 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
 #line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7548 "VideoSupport.c"
+#line 7560 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gint _tmp2_ = 0;
@@ -7567,18 +7579,18 @@ void video_get_frame_dimensions (Video* self, Dimensions* result) {
 			dimensions_init (&_tmp5_, _tmp2_, _tmp4_);
 #line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp5_;
-#line 7567 "VideoSupport.c"
+#line 7579 "VideoSupport.c"
 			{
 				VideoRow* _tmp6_ = NULL;
 #line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = self->priv->backing_row;
 #line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7574 "VideoSupport.c"
+#line 7586 "VideoSupport.c"
 			}
 #line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7578 "VideoSupport.c"
+#line 7590 "VideoSupport.c"
 		}
 		__finally526:
 		{
@@ -7587,7 +7599,7 @@ void video_get_frame_dimensions (Video* self, Dimensions* result) {
 			_tmp7_ = self->priv->backing_row;
 #line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7587 "VideoSupport.c"
+#line 7599 "VideoSupport.c"
 		}
 #line 812 "/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);
@@ -7595,7 +7607,7 @@ void video_get_frame_dimensions (Video* self, Dimensions* result) {
 		g_clear_error (&_inner_error_);
 #line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7595 "VideoSupport.c"
+#line 7607 "VideoSupport.c"
 	}
 }
 
@@ -7611,7 +7623,7 @@ static void video_real_get_dimensions (MediaSource* base, PhotoException disallo
 	*result = _tmp0_;
 #line 818 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return;
-#line 7611 "VideoSupport.c"
+#line 7623 "VideoSupport.c"
 }
 
 
@@ -7627,7 +7639,7 @@ static guint64 video_real_get_filesize (MediaSource* base) {
 	result = _tmp0_;
 #line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7627 "VideoSupport.c"
+#line 7639 "VideoSupport.c"
 }
 
 
@@ -7637,14 +7649,15 @@ static guint64 video_real_get_master_filesize (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7637 "VideoSupport.c"
+#line 7649 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
+		guint64 _tmp5_ = 0ULL;
 #line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7644 "VideoSupport.c"
+#line 7657 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gint64 _tmp2_ = 0LL;
@@ -7654,18 +7667,18 @@ static guint64 video_real_get_master_filesize (MediaSource* base) {
 			_tmp2_ = _tmp1_->filesize;
 #line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = (guint64) _tmp2_;
-#line 7654 "VideoSupport.c"
+#line 7667 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
 #line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
 #line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7661 "VideoSupport.c"
+#line 7674 "VideoSupport.c"
 			}
 #line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7665 "VideoSupport.c"
+#line 7678 "VideoSupport.c"
 		}
 		__finally527:
 		{
@@ -7674,15 +7687,15 @@ static guint64 video_real_get_master_filesize (MediaSource* base) {
 			_tmp4_ = self->priv->backing_row;
 #line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7674 "VideoSupport.c"
+#line 7687 "VideoSupport.c"
 		}
 #line 826 "/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"
 		g_clear_error (&_inner_error_);
 #line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		return 0ULL;
-#line 7682 "VideoSupport.c"
+		return _tmp5_;
+#line 7695 "VideoSupport.c"
 	}
 }
 
@@ -7693,14 +7706,15 @@ static time_t video_real_get_timestamp (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7693 "VideoSupport.c"
+#line 7706 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
+		time_t _tmp5_ = 0;
 #line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7700 "VideoSupport.c"
+#line 7714 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			time_t _tmp2_ = 0;
@@ -7710,18 +7724,18 @@ static time_t video_real_get_timestamp (MediaSource* base) {
 			_tmp2_ = _tmp1_->timestamp;
 #line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7710 "VideoSupport.c"
+#line 7724 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
 #line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
 #line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7717 "VideoSupport.c"
+#line 7731 "VideoSupport.c"
 			}
 #line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7721 "VideoSupport.c"
+#line 7735 "VideoSupport.c"
 		}
 		__finally528:
 		{
@@ -7730,15 +7744,15 @@ static time_t video_real_get_timestamp (MediaSource* base) {
 			_tmp4_ = self->priv->backing_row;
 #line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7730 "VideoSupport.c"
+#line 7744 "VideoSupport.c"
 		}
 #line 832 "/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"
 		g_clear_error (&_inner_error_);
 #line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		return 0;
-#line 7738 "VideoSupport.c"
+		return _tmp5_;
+#line 7752 "VideoSupport.c"
 	}
 }
 
@@ -7761,7 +7775,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 	g_file_info_get_modification_time (_tmp0_, &_tmp1_);
 #line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	time_val = _tmp1_;
-#line 7761 "VideoSupport.c"
+#line 7775 "VideoSupport.c"
 	{
 		{
 			VideoRow* _tmp2_ = NULL;
@@ -7769,7 +7783,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 			_tmp2_ = self->priv->backing_row;
 #line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7769 "VideoSupport.c"
+#line 7783 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
 				time_t _tmp4_ = 0;
@@ -7794,18 +7808,18 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 				_tmp6_ = _tmp5_.tv_sec;
 #line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_tmp4_ == ((time_t) _tmp6_)) {
-#line 7794 "VideoSupport.c"
+#line 7808 "VideoSupport.c"
 					{
 						VideoRow* _tmp7_ = NULL;
 #line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp7_ = self->priv->backing_row;
 #line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7801 "VideoSupport.c"
+#line 7815 "VideoSupport.c"
 					}
 #line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 7805 "VideoSupport.c"
+#line 7819 "VideoSupport.c"
 				}
 #line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = video_table_get_instance ();
@@ -7825,7 +7839,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 				_database_table_unref0 (_tmp9_);
 #line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7825 "VideoSupport.c"
+#line 7839 "VideoSupport.c"
 					goto __finally530;
 				}
 #line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7836,7 +7850,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 				_tmp16_ = _tmp15_.tv_sec;
 #line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_->timestamp = (time_t) _tmp16_;
-#line 7836 "VideoSupport.c"
+#line 7850 "VideoSupport.c"
 			}
 			__finally530:
 			{
@@ -7845,13 +7859,13 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 				_tmp17_ = self->priv->backing_row;
 #line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7845 "VideoSupport.c"
+#line 7859 "VideoSupport.c"
 			}
 #line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 7851 "VideoSupport.c"
+#line 7865 "VideoSupport.c"
 					goto __catch529_database_error;
 				}
 #line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7860,7 +7874,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 				g_clear_error (&_inner_error_);
 #line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 7860 "VideoSupport.c"
+#line 7874 "VideoSupport.c"
 			}
 		}
 	}
@@ -7881,7 +7895,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 		_g_error_free0 (err);
 #line 851 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7881 "VideoSupport.c"
+#line 7895 "VideoSupport.c"
 	}
 	__finally529:
 #line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -7892,7 +7906,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 		g_clear_error (&_inner_error_);
 #line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7892 "VideoSupport.c"
+#line 7906 "VideoSupport.c"
 	}
 #line 854 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = alteration_new ("metadata", "master-timestamp");
@@ -7902,7 +7916,7 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
 #line 854 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp20_);
-#line 7902 "VideoSupport.c"
+#line 7916 "VideoSupport.c"
 }
 
 
@@ -7911,14 +7925,14 @@ gchar* video_get_filename (Video* self) {
 	GError * _inner_error_ = NULL;
 #line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), NULL);
-#line 7911 "VideoSupport.c"
+#line 7925 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
 #line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7918 "VideoSupport.c"
+#line 7932 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
@@ -7931,18 +7945,18 @@ gchar* video_get_filename (Video* self) {
 			_tmp3_ = g_strdup (_tmp2_);
 #line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 7931 "VideoSupport.c"
+#line 7945 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_ = NULL;
 #line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
 #line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7938 "VideoSupport.c"
+#line 7952 "VideoSupport.c"
 			}
 #line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7942 "VideoSupport.c"
+#line 7956 "VideoSupport.c"
 		}
 		__finally531:
 		{
@@ -7951,7 +7965,7 @@ gchar* video_get_filename (Video* self) {
 			_tmp5_ = self->priv->backing_row;
 #line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7951 "VideoSupport.c"
+#line 7965 "VideoSupport.c"
 		}
 #line 858 "/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);
@@ -7959,7 +7973,7 @@ gchar* video_get_filename (Video* self) {
 		g_clear_error (&_inner_error_);
 #line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 7959 "VideoSupport.c"
+#line 7973 "VideoSupport.c"
 	}
 }
 
@@ -7987,7 +8001,7 @@ static GFile* video_real_get_file (MediaSource* base) {
 	result = _tmp3_;
 #line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7987 "VideoSupport.c"
+#line 8001 "VideoSupport.c"
 }
 
 
@@ -8003,7 +8017,7 @@ static GFile* video_real_get_master_file (MediaSource* base) {
 	result = _tmp0_;
 #line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8003 "VideoSupport.c"
+#line 8017 "VideoSupport.c"
 }
 
 
@@ -8043,11 +8057,11 @@ void video_export (Video* self, GFile* dest_file, GError** error) {
 		_g_object_unref0 (source_file);
 #line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 8043 "VideoSupport.c"
+#line 8057 "VideoSupport.c"
 	}
 #line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (source_file);
-#line 8047 "VideoSupport.c"
+#line 8061 "VideoSupport.c"
 }
 
 
@@ -8056,14 +8070,15 @@ gdouble video_get_clip_duration (Video* self) {
 	GError * _inner_error_ = NULL;
 #line 877 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0.0);
-#line 8056 "VideoSupport.c"
+#line 8070 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
+		gdouble _tmp5_ = 0.0;
 #line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8063 "VideoSupport.c"
+#line 8078 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gdouble _tmp2_ = 0.0;
@@ -8073,18 +8088,18 @@ gdouble video_get_clip_duration (Video* self) {
 			_tmp2_ = _tmp1_->clip_duration;
 #line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 8073 "VideoSupport.c"
+#line 8088 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
 #line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
 #line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8080 "VideoSupport.c"
+#line 8095 "VideoSupport.c"
 			}
 #line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 8084 "VideoSupport.c"
+#line 8099 "VideoSupport.c"
 		}
 		__finally532:
 		{
@@ -8093,15 +8108,15 @@ gdouble video_get_clip_duration (Video* self) {
 			_tmp4_ = self->priv->backing_row;
 #line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8093 "VideoSupport.c"
+#line 8108 "VideoSupport.c"
 		}
 #line 878 "/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"
 		g_clear_error (&_inner_error_);
 #line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		return 0.0;
-#line 8101 "VideoSupport.c"
+		return _tmp5_;
+#line 8116 "VideoSupport.c"
 	}
 }
 
@@ -8111,14 +8126,15 @@ gboolean video_get_is_interpretable (Video* self) {
 	GError * _inner_error_ = NULL;
 #line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), FALSE);
-#line 8111 "VideoSupport.c"
+#line 8126 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
+		gboolean _tmp5_ = FALSE;
 #line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8118 "VideoSupport.c"
+#line 8134 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
@@ -8128,18 +8144,18 @@ gboolean video_get_is_interpretable (Video* self) {
 			_tmp2_ = _tmp1_->is_interpretable;
 #line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 8128 "VideoSupport.c"
+#line 8144 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
 #line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
 #line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8135 "VideoSupport.c"
+#line 8151 "VideoSupport.c"
 			}
 #line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 8139 "VideoSupport.c"
+#line 8155 "VideoSupport.c"
 		}
 		__finally533:
 		{
@@ -8148,15 +8164,15 @@ gboolean video_get_is_interpretable (Video* self) {
 			_tmp4_ = self->priv->backing_row;
 #line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8148 "VideoSupport.c"
+#line 8164 "VideoSupport.c"
 		}
 #line 884 "/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"
 		g_clear_error (&_inner_error_);
 #line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		return FALSE;
-#line 8156 "VideoSupport.c"
+		return _tmp5_;
+#line 8172 "VideoSupport.c"
 	}
 }
 
@@ -8165,14 +8181,14 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 	GError * _inner_error_ = NULL;
 #line 889 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 8165 "VideoSupport.c"
+#line 8181 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
 #line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8172 "VideoSupport.c"
+#line 8188 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
@@ -8187,18 +8203,18 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 			_tmp3_ = is_interpretable;
 #line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp2_ == _tmp3_) {
-#line 8187 "VideoSupport.c"
+#line 8203 "VideoSupport.c"
 				{
 					VideoRow* _tmp4_ = NULL;
 #line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp4_ = self->priv->backing_row;
 #line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8194 "VideoSupport.c"
+#line 8210 "VideoSupport.c"
 				}
 #line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 8198 "VideoSupport.c"
+#line 8214 "VideoSupport.c"
 			}
 #line 894 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
@@ -8206,7 +8222,7 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 			_tmp6_ = is_interpretable;
 #line 894 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_->is_interpretable = _tmp6_;
-#line 8206 "VideoSupport.c"
+#line 8222 "VideoSupport.c"
 		}
 		__finally534:
 		{
@@ -8215,7 +8231,7 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 			_tmp7_ = self->priv->backing_row;
 #line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8215 "VideoSupport.c"
+#line 8231 "VideoSupport.c"
 		}
 #line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -8225,7 +8241,7 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 			g_clear_error (&_inner_error_);
 #line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8225 "VideoSupport.c"
+#line 8241 "VideoSupport.c"
 		}
 	}
 	{
@@ -8249,7 +8265,7 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8249 "VideoSupport.c"
+#line 8265 "VideoSupport.c"
 				goto __catch535_database_error;
 			}
 #line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8258,7 +8274,7 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 			g_clear_error (&_inner_error_);
 #line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8258 "VideoSupport.c"
+#line 8274 "VideoSupport.c"
 		}
 	}
 	goto __finally535;
@@ -8276,7 +8292,7 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 		app_window_database_error (_tmp12_);
 #line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 8276 "VideoSupport.c"
+#line 8292 "VideoSupport.c"
 	}
 	__finally535:
 #line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8287,7 +8303,7 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 		g_clear_error (&_inner_error_);
 #line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 8287 "VideoSupport.c"
+#line 8303 "VideoSupport.c"
 	}
 }
 
@@ -8336,7 +8352,7 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 	_g_object_unref0 (_tmp2_);
 #line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	backing_file_reader = _tmp4_;
-#line 8336 "VideoSupport.c"
+#line 8352 "VideoSupport.c"
 	{
 		gdouble _tmp5_ = 0.0;
 		VideoReader* _tmp6_ = NULL;
@@ -8353,7 +8369,7 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
-#line 8353 "VideoSupport.c"
+#line 8369 "VideoSupport.c"
 				goto __catch536_video_error;
 			}
 #line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8368,7 +8384,7 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 			g_clear_error (&_inner_error_);
 #line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 8368 "VideoSupport.c"
+#line 8384 "VideoSupport.c"
 		}
 #line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		clip_duration = _tmp5_;
@@ -8380,7 +8396,7 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 		_g_object_unref0 (preview_frame);
 #line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		preview_frame = _tmp9_;
-#line 8380 "VideoSupport.c"
+#line 8396 "VideoSupport.c"
 	}
 	goto __finally536;
 	__catch536_video_error:
@@ -8413,7 +8429,7 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 		_g_object_unref0 (preview_frame);
 #line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 8413 "VideoSupport.c"
+#line 8429 "VideoSupport.c"
 	}
 	__finally536:
 #line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8430,13 +8446,13 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 		g_clear_error (&_inner_error_);
 #line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 8430 "VideoSupport.c"
+#line 8446 "VideoSupport.c"
 	}
 #line 927 "/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 8436 "VideoSupport.c"
+#line 8452 "VideoSupport.c"
 		VideoInterpretableResults* _tmp14_ = NULL;
 		VideoInterpretableResults* _tmp15_ = NULL;
 #line 928 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8455,7 +8471,7 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 		_g_object_unref0 (preview_frame);
 #line 931 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 8455 "VideoSupport.c"
+#line 8471 "VideoSupport.c"
 	}
 #line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp16_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
@@ -8471,14 +8487,14 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 	_g_free0 (_tmp19_);
 #line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp17_);
-#line 8471 "VideoSupport.c"
+#line 8487 "VideoSupport.c"
 	{
 		VideoRow* _tmp20_ = NULL;
 #line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp20_ = self->priv->backing_row;
 #line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8478 "VideoSupport.c"
+#line 8494 "VideoSupport.c"
 		{
 			VideoRow* _tmp21_ = NULL;
 			gdouble _tmp22_ = 0.0;
@@ -8488,7 +8504,7 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 			_tmp22_ = clip_duration;
 #line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_->clip_duration = _tmp22_;
-#line 8488 "VideoSupport.c"
+#line 8504 "VideoSupport.c"
 		}
 		__finally537:
 		{
@@ -8497,7 +8513,7 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 			_tmp23_ = self->priv->backing_row;
 #line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8497 "VideoSupport.c"
+#line 8513 "VideoSupport.c"
 		}
 #line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -8513,7 +8529,7 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 			g_clear_error (&_inner_error_);
 #line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 8513 "VideoSupport.c"
+#line 8529 "VideoSupport.c"
 		}
 	}
 #line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8542,7 +8558,7 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 	_g_object_unref0 (preview_frame);
 #line 945 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8542 "VideoSupport.c"
+#line 8558 "VideoSupport.c"
 }
 
 
@@ -8559,7 +8575,7 @@ static void video_real_destroy (DataSource* base) {
 	video_id = _tmp0_;
 #line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 8559 "VideoSupport.c"
+#line 8575 "VideoSupport.c"
 	{
 		VideoTable* _tmp1_ = NULL;
 		VideoTable* _tmp2_ = NULL;
@@ -8578,7 +8594,7 @@ static void video_real_destroy (DataSource* base) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8578 "VideoSupport.c"
+#line 8594 "VideoSupport.c"
 				goto __catch538_database_error;
 			}
 #line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8587,7 +8603,7 @@ static void video_real_destroy (DataSource* base) {
 			g_clear_error (&_inner_error_);
 #line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8587 "VideoSupport.c"
+#line 8603 "VideoSupport.c"
 		}
 	}
 	goto __finally538;
@@ -8610,7 +8626,7 @@ static void video_real_destroy (DataSource* base) {
 		_g_free0 (_tmp5_);
 #line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 8610 "VideoSupport.c"
+#line 8626 "VideoSupport.c"
 	}
 	__finally538:
 #line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8621,11 +8637,11 @@ static void video_real_destroy (DataSource* base) {
 		g_clear_error (&_inner_error_);
 #line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 8621 "VideoSupport.c"
+#line 8637 "VideoSupport.c"
 	}
 #line 959 "/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 8625 "VideoSupport.c"
+#line 8641 "VideoSupport.c"
 }
 
 
@@ -8650,27 +8666,29 @@ static gboolean video_real_internal_delete_backing (DataSource* base, GError** e
 	_tmp2_ = _tmp3_;
 #line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 8666 "VideoSupport.c"
+		gboolean _tmp4_ = FALSE;
 #line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		return FALSE;
-#line 8654 "VideoSupport.c"
+		return _tmp4_;
+#line 8672 "VideoSupport.c"
 	}
 #line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
 #line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = ret;
-#line 8660 "VideoSupport.c"
+#line 8678 "VideoSupport.c"
 	} else {
 #line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 8664 "VideoSupport.c"
+#line 8682 "VideoSupport.c"
 	}
 #line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
 #line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8670 "VideoSupport.c"
+#line 8688 "VideoSupport.c"
 }
 
 
@@ -8691,7 +8709,7 @@ static void video_notify_flags_altered (Video* self, Alteration* additional_alte
 	_tmp1_ = additional_alteration;
 #line 971 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_ != NULL) {
-#line 8691 "VideoSupport.c"
+#line 8709 "VideoSupport.c"
 		Alteration* _tmp2_ = NULL;
 		Alteration* _tmp3_ = NULL;
 		Alteration* _tmp4_ = NULL;
@@ -8705,7 +8723,7 @@ static void video_notify_flags_altered (Video* self, Alteration* additional_alte
 		_alteration_unref0 (alteration);
 #line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		alteration = _tmp4_;
-#line 8705 "VideoSupport.c"
+#line 8723 "VideoSupport.c"
 	}
 #line 974 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = alteration;
@@ -8713,27 +8731,27 @@ static void video_notify_flags_altered (Video* self, Alteration* additional_alte
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_);
 #line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (alteration);
-#line 8713 "VideoSupport.c"
+#line 8731 "VideoSupport.c"
 }
 
 
 guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* additional_alteration) {
 	guint64 result = 0ULL;
 	guint64 new_flags = 0ULL;
-	Alteration* _tmp24_ = NULL;
+	Alteration* _tmp27_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 977 "/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"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 8726 "VideoSupport.c"
+#line 8744 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
 #line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8733 "VideoSupport.c"
+#line 8751 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -8742,8 +8760,8 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 			VideoRow* _tmp5_ = NULL;
 			guint64 _tmp6_ = 0ULL;
 			guint64 _tmp7_ = 0ULL;
-			VideoRow* _tmp21_ = NULL;
-			guint64 _tmp22_ = 0ULL;
+			VideoRow* _tmp23_ = NULL;
+			guint64 _tmp24_ = 0ULL;
 #line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
 #line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8762,7 +8780,7 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 			_tmp7_ = new_flags;
 #line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp6_ == _tmp7_) {
-#line 8762 "VideoSupport.c"
+#line 8780 "VideoSupport.c"
 				VideoRow* _tmp8_ = NULL;
 				guint64 _tmp9_ = 0ULL;
 #line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8771,18 +8789,18 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 				_tmp9_ = _tmp8_->flags;
 #line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp9_;
-#line 8771 "VideoSupport.c"
+#line 8789 "VideoSupport.c"
 				{
 					VideoRow* _tmp10_ = NULL;
 #line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp10_ = self->priv->backing_row;
 #line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8778 "VideoSupport.c"
+#line 8796 "VideoSupport.c"
 				}
 #line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8782 "VideoSupport.c"
+#line 8800 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp11_ = NULL;
@@ -8803,9 +8821,11 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 				_database_table_unref0 (_tmp12_);
 #line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 8821 "VideoSupport.c"
+					guint64 _tmp16_ = 0ULL;
 #line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8805 "VideoSupport.c"
+#line 8825 "VideoSupport.c"
 						goto __catch540_database_error;
 					}
 					{
@@ -8814,130 +8834,133 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 						_tmp15_ = self->priv->backing_row;
 #line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8814 "VideoSupport.c"
+#line 8834 "VideoSupport.c"
 					}
 #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 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
 #line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					return 0ULL;
-#line 8822 "VideoSupport.c"
+					return _tmp16_;
+#line 8842 "VideoSupport.c"
 				}
 			}
 			goto __finally540;
 			__catch540_database_error:
 			{
 				GError* e = NULL;
-				GError* _tmp16_ = NULL;
-				VideoRow* _tmp17_ = NULL;
-				guint64 _tmp18_ = 0ULL;
+				GError* _tmp17_ = NULL;
+				VideoRow* _tmp18_ = NULL;
+				guint64 _tmp19_ = 0ULL;
 #line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
 #line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
 #line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp16_ = e;
+				_tmp17_ = e;
 #line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				app_window_database_error (_tmp16_);
+				app_window_database_error (_tmp17_);
 #line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp17_ = self->priv->backing_row;
+				_tmp18_ = self->priv->backing_row;
 #line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp18_ = _tmp17_->flags;
+				_tmp19_ = _tmp18_->flags;
 #line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				result = _tmp18_;
+				result = _tmp19_;
 #line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 8848 "VideoSupport.c"
+#line 8868 "VideoSupport.c"
 				{
-					VideoRow* _tmp19_ = NULL;
+					VideoRow* _tmp20_ = NULL;
 #line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp19_ = self->priv->backing_row;
+					_tmp20_ = self->priv->backing_row;
 #line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8855 "VideoSupport.c"
+#line 8875 "VideoSupport.c"
 				}
 #line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8859 "VideoSupport.c"
+#line 8879 "VideoSupport.c"
 			}
 			__finally540:
 #line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8864 "VideoSupport.c"
+#line 8884 "VideoSupport.c"
+				guint64 _tmp22_ = 0ULL;
 				{
-					VideoRow* _tmp20_ = NULL;
+					VideoRow* _tmp21_ = NULL;
 #line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp20_ = self->priv->backing_row;
+					_tmp21_ = self->priv->backing_row;
 #line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8871 "VideoSupport.c"
+#line 8892 "VideoSupport.c"
 				}
 #line 984 "/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"
 				g_clear_error (&_inner_error_);
 #line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				return 0ULL;
-#line 8879 "VideoSupport.c"
+				return _tmp22_;
+#line 8900 "VideoSupport.c"
 			}
 #line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp21_ = self->priv->backing_row;
+			_tmp23_ = self->priv->backing_row;
 #line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp22_ = new_flags;
+			_tmp24_ = new_flags;
 #line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp21_->flags = _tmp22_;
-#line 8887 "VideoSupport.c"
+			_tmp23_->flags = _tmp24_;
+#line 8908 "VideoSupport.c"
 		}
 		__finally539:
 		{
-			VideoRow* _tmp23_ = NULL;
+			VideoRow* _tmp25_ = NULL;
 #line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp23_ = self->priv->backing_row;
+			_tmp25_ = self->priv->backing_row;
 #line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8896 "VideoSupport.c"
+#line 8917 "VideoSupport.c"
 		}
 #line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 8921 "VideoSupport.c"
+			guint64 _tmp26_ = 0ULL;
 #line 979 "/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"
 			g_clear_error (&_inner_error_);
 #line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			return 0ULL;
-#line 8906 "VideoSupport.c"
+			return _tmp26_;
+#line 8929 "VideoSupport.c"
 		}
 	}
 #line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp24_ = additional_alteration;
+	_tmp27_ = additional_alteration;
 #line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video_notify_flags_altered (self, _tmp24_);
+	video_notify_flags_altered (self, _tmp27_);
 #line 996 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = new_flags;
 #line 996 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8917 "VideoSupport.c"
+#line 8940 "VideoSupport.c"
 }
 
 
 guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* additional_alteration) {
 	guint64 result = 0ULL;
 	guint64 new_flags = 0ULL;
-	Alteration* _tmp24_ = NULL;
+	Alteration* _tmp27_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 999 "/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"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 8930 "VideoSupport.c"
+#line 8953 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
 #line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8937 "VideoSupport.c"
+#line 8960 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -8946,8 +8969,8 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 			VideoRow* _tmp5_ = NULL;
 			guint64 _tmp6_ = 0ULL;
 			guint64 _tmp7_ = 0ULL;
-			VideoRow* _tmp21_ = NULL;
-			guint64 _tmp22_ = 0ULL;
+			VideoRow* _tmp23_ = NULL;
+			guint64 _tmp24_ = 0ULL;
 #line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
 #line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8966,7 +8989,7 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 			_tmp7_ = new_flags;
 #line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp6_ == _tmp7_) {
-#line 8966 "VideoSupport.c"
+#line 8989 "VideoSupport.c"
 				VideoRow* _tmp8_ = NULL;
 				guint64 _tmp9_ = 0ULL;
 #line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -8975,18 +8998,18 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 				_tmp9_ = _tmp8_->flags;
 #line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp9_;
-#line 8975 "VideoSupport.c"
+#line 8998 "VideoSupport.c"
 				{
 					VideoRow* _tmp10_ = NULL;
 #line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp10_ = self->priv->backing_row;
 #line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8982 "VideoSupport.c"
+#line 9005 "VideoSupport.c"
 				}
 #line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8986 "VideoSupport.c"
+#line 9009 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp11_ = NULL;
@@ -9007,9 +9030,11 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 				_database_table_unref0 (_tmp12_);
 #line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 9030 "VideoSupport.c"
+					guint64 _tmp16_ = 0ULL;
 #line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 9009 "VideoSupport.c"
+#line 9034 "VideoSupport.c"
 						goto __catch542_database_error;
 					}
 					{
@@ -9018,110 +9043,113 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 						_tmp15_ = self->priv->backing_row;
 #line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9018 "VideoSupport.c"
+#line 9043 "VideoSupport.c"
 					}
 #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 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
 #line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					return 0ULL;
-#line 9026 "VideoSupport.c"
+					return _tmp16_;
+#line 9051 "VideoSupport.c"
 				}
 			}
 			goto __finally542;
 			__catch542_database_error:
 			{
 				GError* e = NULL;
-				GError* _tmp16_ = NULL;
-				VideoRow* _tmp17_ = NULL;
-				guint64 _tmp18_ = 0ULL;
+				GError* _tmp17_ = NULL;
+				VideoRow* _tmp18_ = NULL;
+				guint64 _tmp19_ = 0ULL;
 #line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
 #line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
 #line 1009 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp16_ = e;
+				_tmp17_ = e;
 #line 1009 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				app_window_database_error (_tmp16_);
+				app_window_database_error (_tmp17_);
 #line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp17_ = self->priv->backing_row;
+				_tmp18_ = self->priv->backing_row;
 #line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp18_ = _tmp17_->flags;
+				_tmp19_ = _tmp18_->flags;
 #line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				result = _tmp18_;
+				result = _tmp19_;
 #line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 9052 "VideoSupport.c"
+#line 9077 "VideoSupport.c"
 				{
-					VideoRow* _tmp19_ = NULL;
+					VideoRow* _tmp20_ = NULL;
 #line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp19_ = self->priv->backing_row;
+					_tmp20_ = self->priv->backing_row;
 #line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9059 "VideoSupport.c"
+#line 9084 "VideoSupport.c"
 				}
 #line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 9063 "VideoSupport.c"
+#line 9088 "VideoSupport.c"
 			}
 			__finally542:
 #line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9068 "VideoSupport.c"
+#line 9093 "VideoSupport.c"
+				guint64 _tmp22_ = 0ULL;
 				{
-					VideoRow* _tmp20_ = NULL;
+					VideoRow* _tmp21_ = NULL;
 #line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp20_ = self->priv->backing_row;
+					_tmp21_ = self->priv->backing_row;
 #line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9075 "VideoSupport.c"
+#line 9101 "VideoSupport.c"
 				}
 #line 1006 "/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"
 				g_clear_error (&_inner_error_);
 #line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				return 0ULL;
-#line 9083 "VideoSupport.c"
+				return _tmp22_;
+#line 9109 "VideoSupport.c"
 			}
 #line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp21_ = self->priv->backing_row;
+			_tmp23_ = self->priv->backing_row;
 #line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp22_ = new_flags;
+			_tmp24_ = new_flags;
 #line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp21_->flags = _tmp22_;
-#line 9091 "VideoSupport.c"
+			_tmp23_->flags = _tmp24_;
+#line 9117 "VideoSupport.c"
 		}
 		__finally541:
 		{
-			VideoRow* _tmp23_ = NULL;
+			VideoRow* _tmp25_ = NULL;
 #line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp23_ = self->priv->backing_row;
+			_tmp25_ = self->priv->backing_row;
 #line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9100 "VideoSupport.c"
+#line 9126 "VideoSupport.c"
 		}
 #line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 9130 "VideoSupport.c"
+			guint64 _tmp26_ = 0ULL;
 #line 1001 "/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"
 			g_clear_error (&_inner_error_);
 #line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			return 0ULL;
-#line 9110 "VideoSupport.c"
+			return _tmp26_;
+#line 9138 "VideoSupport.c"
 		}
 	}
 #line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp24_ = additional_alteration;
+	_tmp27_ = additional_alteration;
 #line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video_notify_flags_altered (self, _tmp24_);
+	video_notify_flags_altered (self, _tmp27_);
 #line 1018 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = new_flags;
 #line 1018 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9121 "VideoSupport.c"
+#line 9149 "VideoSupport.c"
 }
 
 
@@ -9130,14 +9158,15 @@ gboolean video_is_flag_set (Video* self, guint64 flag) {
 	GError * _inner_error_ = NULL;
 #line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), FALSE);
-#line 9130 "VideoSupport.c"
+#line 9158 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
+		gboolean _tmp7_ = FALSE;
 #line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
 #line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 9137 "VideoSupport.c"
+#line 9166 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -9153,18 +9182,18 @@ gboolean video_is_flag_set (Video* self, guint64 flag) {
 			_tmp4_ = media_source_internal_is_flag_set (_tmp2_, _tmp3_);
 #line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp4_;
-#line 9153 "VideoSupport.c"
+#line 9182 "VideoSupport.c"
 			{
 				VideoRow* _tmp5_ = NULL;
 #line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = self->priv->backing_row;
 #line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9160 "VideoSupport.c"
+#line 9189 "VideoSupport.c"
 			}
 #line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 9164 "VideoSupport.c"
+#line 9193 "VideoSupport.c"
 		}
 		__finally543:
 		{
@@ -9173,15 +9202,15 @@ gboolean video_is_flag_set (Video* self, guint64 flag) {
 			_tmp6_ = self->priv->backing_row;
 #line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9173 "VideoSupport.c"
+#line 9202 "VideoSupport.c"
 		}
 #line 1022 "/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"
 		g_clear_error (&_inner_error_);
 #line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		return FALSE;
-#line 9181 "VideoSupport.c"
+		return _tmp7_;
+#line 9210 "VideoSupport.c"
 	}
 }
 
@@ -9212,7 +9241,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 	new_filepath = _tmp1_;
 #line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	old_filepath = NULL;
-#line 9212 "VideoSupport.c"
+#line 9241 "VideoSupport.c"
 	{
 		{
 			VideoRow* _tmp2_ = NULL;
@@ -9220,7 +9249,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 			_tmp2_ = self->priv->backing_row;
 #line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 9220 "VideoSupport.c"
+#line 9249 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
 				const gchar* _tmp4_ = NULL;
@@ -9244,14 +9273,14 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 				_tmp5_ = new_filepath;
 #line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 9244 "VideoSupport.c"
+#line 9273 "VideoSupport.c"
 					{
 						VideoRow* _tmp6_ = NULL;
 #line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp6_ = self->priv->backing_row;
 #line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9251 "VideoSupport.c"
+#line 9280 "VideoSupport.c"
 					}
 #line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (old_filepath);
@@ -9259,7 +9288,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 					_g_free0 (new_filepath);
 #line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 9259 "VideoSupport.c"
+#line 9288 "VideoSupport.c"
 				}
 #line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = self->priv->backing_row;
@@ -9287,7 +9316,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 				_database_table_unref0 (_tmp11_);
 #line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9287 "VideoSupport.c"
+#line 9316 "VideoSupport.c"
 					goto __finally545;
 				}
 #line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9300,7 +9329,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 				_g_free0 (_tmp15_->filepath);
 #line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_->filepath = _tmp17_;
-#line 9300 "VideoSupport.c"
+#line 9329 "VideoSupport.c"
 			}
 			__finally545:
 			{
@@ -9309,13 +9338,13 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 				_tmp18_ = self->priv->backing_row;
 #line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9309 "VideoSupport.c"
+#line 9338 "VideoSupport.c"
 			}
 #line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 9315 "VideoSupport.c"
+#line 9344 "VideoSupport.c"
 					goto __catch544_database_error;
 				}
 #line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9328,7 +9357,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 				g_clear_error (&_inner_error_);
 #line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 9328 "VideoSupport.c"
+#line 9357 "VideoSupport.c"
 			}
 		}
 	}
@@ -9353,7 +9382,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 		_g_free0 (new_filepath);
 #line 1043 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 9353 "VideoSupport.c"
+#line 9382 "VideoSupport.c"
 	}
 	__finally544:
 #line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9368,7 +9397,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 		g_clear_error (&_inner_error_);
 #line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 9368 "VideoSupport.c"
+#line 9397 "VideoSupport.c"
 	}
 #line 1046 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = old_filepath;
@@ -9398,7 +9427,7 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 	_g_free0 (old_filepath);
 #line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_filepath);
-#line 9398 "VideoSupport.c"
+#line 9427 "VideoSupport.c"
 }
 
 
@@ -9439,7 +9468,7 @@ VideoMetadata* video_read_metadata (Video* self, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 9439 "VideoSupport.c"
+#line 9468 "VideoSupport.c"
 	}
 #line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = _tmp0_;
@@ -9451,7 +9480,7 @@ VideoMetadata* video_read_metadata (Video* self, GError** error) {
 	_media_metadata_unref0 (_tmp0_);
 #line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9451 "VideoSupport.c"
+#line 9480 "VideoSupport.c"
 }
 
 
@@ -9473,14 +9502,14 @@ VideoInterpretableResults* video_interpretable_results_construct (GType object_t
 	self->video = _tmp1_;
 #line 335 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 9473 "VideoSupport.c"
+#line 9502 "VideoSupport.c"
 }
 
 
 VideoInterpretableResults* video_interpretable_results_new (Video* video) {
 #line 335 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_interpretable_results_construct (VIDEO_TYPE_INTERPRETABLE_RESULTS, video);
-#line 9480 "VideoSupport.c"
+#line 9509 "VideoSupport.c"
 }
 
 
@@ -9494,7 +9523,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 	_tmp0_ = self->update_interpretable;
 #line 340 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 9494 "VideoSupport.c"
+#line 9523 "VideoSupport.c"
 		Video* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
 #line 341 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9503,13 +9532,13 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 		_tmp2_ = self->is_interpretable;
 #line 341 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_set_is_interpretable (_tmp1_, _tmp2_);
-#line 9503 "VideoSupport.c"
+#line 9532 "VideoSupport.c"
 	}
 #line 343 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = self->new_thumbnail;
 #line 343 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp3_ != NULL) {
-#line 9509 "VideoSupport.c"
+#line 9538 "VideoSupport.c"
 		{
 			Video* _tmp4_ = NULL;
 			GdkPixbuf* _tmp5_ = NULL;
@@ -9524,7 +9553,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			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"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9524 "VideoSupport.c"
+#line 9553 "VideoSupport.c"
 				goto __catch546_g_error;
 			}
 #line 346 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9535,14 +9564,14 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			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"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9535 "VideoSupport.c"
+#line 9564 "VideoSupport.c"
 				goto __catch546_g_error;
 			}
 #line 348 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = self->video;
 #line 348 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 9542 "VideoSupport.c"
+#line 9571 "VideoSupport.c"
 		}
 		goto __finally546;
 		__catch546_g_error:
@@ -9573,7 +9602,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			_g_free0 (_tmp11_);
 #line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_error_free0 (err);
-#line 9573 "VideoSupport.c"
+#line 9602 "VideoSupport.c"
 		}
 		__finally546:
 #line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9584,7 +9613,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			g_clear_error (&_inner_error_);
 #line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 9584 "VideoSupport.c"
+#line 9613 "VideoSupport.c"
 		}
 	}
 }
@@ -9593,7 +9622,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 static void video_value_interpretable_results_init (GValue* value) {
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 9593 "VideoSupport.c"
+#line 9622 "VideoSupport.c"
 }
 
 
@@ -9602,7 +9631,7 @@ static void video_value_interpretable_results_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (value->data[0].v_pointer);
-#line 9602 "VideoSupport.c"
+#line 9631 "VideoSupport.c"
 	}
 }
 
@@ -9612,11 +9641,11 @@ static void video_value_interpretable_results_copy_value (const GValue* src_valu
 	if (src_value->data[0].v_pointer) {
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = video_interpretable_results_ref (src_value->data[0].v_pointer);
-#line 9612 "VideoSupport.c"
+#line 9641 "VideoSupport.c"
 	} else {
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9616 "VideoSupport.c"
+#line 9645 "VideoSupport.c"
 	}
 }
 
@@ -9624,37 +9653,37 @@ static void video_value_interpretable_results_copy_value (const GValue* src_valu
 static gpointer video_value_interpretable_results_peek_pointer (const GValue* value) {
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 9624 "VideoSupport.c"
+#line 9653 "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"
 	if (collect_values[0].v_pointer) {
-#line 9631 "VideoSupport.c"
+#line 9660 "VideoSupport.c"
 		VideoInterpretableResults* object;
 		object = collect_values[0].v_pointer;
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9638 "VideoSupport.c"
+#line 9667 "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"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9642 "VideoSupport.c"
+#line 9671 "VideoSupport.c"
 		}
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = video_interpretable_results_ref (object);
-#line 9646 "VideoSupport.c"
+#line 9675 "VideoSupport.c"
 	} else {
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9650 "VideoSupport.c"
+#line 9679 "VideoSupport.c"
 	}
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 9654 "VideoSupport.c"
+#line 9683 "VideoSupport.c"
 }
 
 
@@ -9665,25 +9694,25 @@ static gchar* video_value_interpretable_results_lcopy_value (const GValue* value
 	if (!object_p) {
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9665 "VideoSupport.c"
+#line 9694 "VideoSupport.c"
 	}
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = NULL;
-#line 9671 "VideoSupport.c"
+#line 9700 "VideoSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9675 "VideoSupport.c"
+#line 9704 "VideoSupport.c"
 	} else {
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = video_interpretable_results_ref (value->data[0].v_pointer);
-#line 9679 "VideoSupport.c"
+#line 9708 "VideoSupport.c"
 	}
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 9683 "VideoSupport.c"
+#line 9712 "VideoSupport.c"
 }
 
 
@@ -9697,7 +9726,7 @@ GParamSpec* video_param_spec_interpretable_results (const gchar* name, const gch
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 9697 "VideoSupport.c"
+#line 9726 "VideoSupport.c"
 }
 
 
@@ -9706,7 +9735,7 @@ gpointer video_value_get_interpretable_results (const GValue* value) {
 	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"
 	return value->data[0].v_pointer;
-#line 9706 "VideoSupport.c"
+#line 9735 "VideoSupport.c"
 }
 
 
@@ -9726,17 +9755,17 @@ void video_value_set_interpretable_results (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_ref (value->data[0].v_pointer);
-#line 9726 "VideoSupport.c"
+#line 9755 "VideoSupport.c"
 	} else {
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9730 "VideoSupport.c"
+#line 9759 "VideoSupport.c"
 	}
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (old);
-#line 9736 "VideoSupport.c"
+#line 9765 "VideoSupport.c"
 	}
 }
 
@@ -9755,17 +9784,17 @@ void video_value_take_interpretable_results (GValue* value, gpointer v_object) {
 		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"
 		value->data[0].v_pointer = v_object;
-#line 9755 "VideoSupport.c"
+#line 9784 "VideoSupport.c"
 	} else {
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9759 "VideoSupport.c"
+#line 9788 "VideoSupport.c"
 	}
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (old);
-#line 9765 "VideoSupport.c"
+#line 9794 "VideoSupport.c"
 	}
 }
 
@@ -9775,7 +9804,7 @@ static void video_interpretable_results_class_init (VideoInterpretableResultsCla
 	video_interpretable_results_parent_class = g_type_class_peek_parent (klass);
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((VideoInterpretableResultsClass *) klass)->finalize = video_interpretable_results_finalize;
-#line 9775 "VideoSupport.c"
+#line 9804 "VideoSupport.c"
 }
 
 
@@ -9788,7 +9817,7 @@ static void video_interpretable_results_instance_init (VideoInterpretableResults
 	self->new_thumbnail = NULL;
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->ref_count = 1;
-#line 9788 "VideoSupport.c"
+#line 9817 "VideoSupport.c"
 }
 
 
@@ -9802,7 +9831,7 @@ static void video_interpretable_results_finalize (VideoInterpretableResults* obj
 	_g_object_unref0 (self->video);
 #line 333 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->new_thumbnail);
-#line 9802 "VideoSupport.c"
+#line 9831 "VideoSupport.c"
 }
 
 
@@ -9827,7 +9856,7 @@ gpointer video_interpretable_results_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return instance;
-#line 9827 "VideoSupport.c"
+#line 9856 "VideoSupport.c"
 }
 
 
@@ -9840,7 +9869,7 @@ void video_interpretable_results_unref (gpointer instance) {
 		VIDEO_INTERPRETABLE_RESULTS_GET_CLASS (self)->finalize (self);
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9840 "VideoSupport.c"
+#line 9869 "VideoSupport.c"
 	}
 }
 
@@ -9851,80 +9880,80 @@ static void video_class_init (VideoClass * klass) {
 #line 322 "/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 = video_real_commit_backlinks;
+	((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 = video_real_set_event_id;
+	((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 = video_real_get_backing_files_state;
+	((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 = video_real_get_thumbnail;
+	((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 = video_real_get_master_md5;
+	((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 = video_real_get_preview_pixbuf;
+	((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 = video_real_create_thumbnail;
+	((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 = video_real_get_typename;
+	((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) video_real_get_typename;
 #line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((DataSourceClass *) klass)->get_instance_id = video_real_get_instance_id;
+	((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 = video_real_get_import_id;
+	((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 = video_real_get_preferred_thumbnail_format;
+	((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 = video_real_get_title;
+	((MediaSourceClass *) klass)->get_title = (gchar* (*)(MediaSource*)) video_real_get_title;
 #line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->set_title = video_real_set_title;
+	((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 = video_real_get_comment;
+	((MediaSourceClass *) klass)->get_comment = (gchar* (*)(MediaSource*)) video_real_get_comment;
 #line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->set_comment = video_real_set_comment;
+	((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 = video_real_get_rating;
+	((MediaSourceClass *) klass)->get_rating = (Rating (*)(MediaSource*)) video_real_get_rating;
 #line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->set_rating = video_real_set_rating;
+	((MediaSourceClass *) klass)->set_rating = (void (*)(MediaSource*, Rating)) video_real_set_rating;
 #line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->increase_rating = video_real_increase_rating;
+	((MediaSourceClass *) klass)->increase_rating = (void (*)(MediaSource*)) video_real_increase_rating;
 #line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->decrease_rating = video_real_decrease_rating;
+	((MediaSourceClass *) klass)->decrease_rating = (void (*)(MediaSource*)) video_real_decrease_rating;
 #line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->is_trashed = video_real_is_trashed;
+	((MediaSourceClass *) klass)->is_trashed = (gboolean (*)(MediaSource*)) video_real_is_trashed;
 #line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->is_offline = video_real_is_offline;
+	((MediaSourceClass *) klass)->is_offline = (gboolean (*)(MediaSource*)) video_real_is_offline;
 #line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->mark_offline = video_real_mark_offline;
+	((MediaSourceClass *) klass)->mark_offline = (void (*)(MediaSource*)) video_real_mark_offline;
 #line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->mark_online = video_real_mark_online;
+	((MediaSourceClass *) klass)->mark_online = (void (*)(MediaSource*)) video_real_mark_online;
 #line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->trash = video_real_trash;
+	((MediaSourceClass *) klass)->trash = (void (*)(MediaSource*)) video_real_trash;
 #line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->untrash = video_real_untrash;
+	((MediaSourceClass *) klass)->untrash = (void (*)(MediaSource*)) video_real_untrash;
 #line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->get_event_id = video_real_get_event_id;
+	((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 = video_real_to_string;
+	((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) video_real_to_string;
 #line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->get_exposure_time = video_real_get_exposure_time;
+	((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 = video_real_get_dimensions;
+	((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 = video_real_get_filesize;
+	((MediaSourceClass *) klass)->get_filesize = (guint64 (*)(MediaSource*)) video_real_get_filesize;
 #line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->get_master_filesize = video_real_get_master_filesize;
+	((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 = video_real_get_timestamp;
+	((MediaSourceClass *) klass)->get_timestamp = (time_t (*)(MediaSource*)) video_real_get_timestamp;
 #line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->get_file = video_real_get_file;
+	((MediaSourceClass *) klass)->get_file = (GFile* (*)(MediaSource*)) video_real_get_file;
 #line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((MediaSourceClass *) klass)->get_master_file = video_real_get_master_file;
+	((MediaSourceClass *) klass)->get_master_file = (GFile* (*)(MediaSource*)) video_real_get_master_file;
 #line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((DataSourceClass *) klass)->destroy = video_real_destroy;
+	((DataSourceClass *) klass)->destroy = (void (*)(DataSource*)) video_real_destroy;
 #line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	((DataSourceClass *) klass)->internal_delete_backing = video_real_internal_delete_backing;
+	((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*)(DataSource*, GError**)) video_real_internal_delete_backing;
 #line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	G_OBJECT_CLASS (klass)->finalize = video_finalize;
-#line 9924 "VideoSupport.c"
+#line 9953 "VideoSupport.c"
 }
 
 
@@ -9937,7 +9966,7 @@ static void video_flaggable_interface_init (FlaggableIface * iface) {
 	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 9937 "VideoSupport.c"
+#line 9966 "VideoSupport.c"
 }
 
 
@@ -9954,7 +9983,7 @@ static void video_monitorable_interface_init (MonitorableIface * iface) {
 	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 9954 "VideoSupport.c"
+#line 9983 "VideoSupport.c"
 }
 
 
@@ -9965,7 +9994,7 @@ static void video_dateable_interface_init (DateableIface * iface) {
 	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 9965 "VideoSupport.c"
+#line 9994 "VideoSupport.c"
 }
 
 
@@ -9974,7 +10003,7 @@ static void video_instance_init (Video * self) {
 	self->priv = VIDEO_GET_PRIVATE (self);
 #line 363 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_rec_mutex_init (&self->priv->__lock_backing_row);
-#line 9974 "VideoSupport.c"
+#line 10003 "VideoSupport.c"
 }
 
 
@@ -9988,7 +10017,7 @@ static void video_finalize (GObject* obj) {
 	_video_row_unref0 (self->priv->backing_row);
 #line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	G_OBJECT_CLASS (video_parent_class)->finalize (obj);
-#line 9988 "VideoSupport.c"
+#line 10017 "VideoSupport.c"
 }
 
 
@@ -10027,7 +10056,7 @@ static gint _uint64_compare_gcompare_data_func (gconstpointer a, gconstpointer b
 	result = uint64_compare ((guint64*) a, (guint64*) b);
 #line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10027 "VideoSupport.c"
+#line 10056 "VideoSupport.c"
 }
 
 
@@ -10039,7 +10068,7 @@ static guint64* _uint64_dup (guint64* self) {
 	memcpy (dup, self, sizeof (guint64));
 #line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return dup;
-#line 10039 "VideoSupport.c"
+#line 10068 "VideoSupport.c"
 }
 
 
@@ -10048,21 +10077,21 @@ static gint64 _video_source_collection_get_video_key_get_source_database_key (Da
 	result = video_source_collection_get_video_key (source);
 #line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10048 "VideoSupport.c"
+#line 10077 "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"
 	video_source_collection_on_trashcan_contents_altered ((VideoSourceCollection*) self, added, removed);
-#line 10055 "VideoSupport.c"
+#line 10084 "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"
 	video_source_collection_on_offline_contents_altered ((VideoSourceCollection*) self, added, removed);
-#line 10062 "VideoSupport.c"
+#line 10091 "VideoSupport.c"
 }
 
 
@@ -10092,14 +10121,14 @@ VideoSourceCollection* video_source_collection_construct (GType object_type) {
 	_source_holding_tank_unref0 (_tmp3_);
 #line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 10092 "VideoSupport.c"
+#line 10121 "VideoSupport.c"
 }
 
 
 VideoSourceCollection* video_source_collection_new (void) {
 #line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_source_collection_construct (TYPE_VIDEO_SOURCE_COLLECTION);
-#line 10099 "VideoSupport.c"
+#line 10128 "VideoSupport.c"
 }
 
 
@@ -10108,7 +10137,7 @@ static gboolean _video_source_collection_is_video_trashed_source_holding_tank_ch
 	result = video_source_collection_is_video_trashed (source);
 #line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10108 "VideoSupport.c"
+#line 10137 "VideoSupport.c"
 }
 
 
@@ -10124,7 +10153,7 @@ static MediaSourceHoldingTank* video_source_collection_real_create_trashcan (Med
 	result = _tmp0_;
 #line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10124 "VideoSupport.c"
+#line 10153 "VideoSupport.c"
 }
 
 
@@ -10133,7 +10162,7 @@ static gboolean _video_source_collection_is_video_offline_source_holding_tank_ch
 	result = video_source_collection_is_video_offline (source);
 #line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10133 "VideoSupport.c"
+#line 10162 "VideoSupport.c"
 }
 
 
@@ -10149,7 +10178,7 @@ static MediaSourceHoldingTank* video_source_collection_real_create_offline_bin (
 	result = _tmp0_;
 #line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10149 "VideoSupport.c"
+#line 10178 "VideoSupport.c"
 }
 
 
@@ -10172,7 +10201,7 @@ static MediaMonitor* video_source_collection_real_create_media_monitor (MediaSou
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_MONITOR, MediaMonitor);
 #line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10172 "VideoSupport.c"
+#line 10201 "VideoSupport.c"
 }
 
 
@@ -10190,7 +10219,7 @@ static gboolean video_source_collection_real_holds_type_of_source (SourceCollect
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_VIDEO);
 #line 1098 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10190 "VideoSupport.c"
+#line 10219 "VideoSupport.c"
 }
 
 
@@ -10206,7 +10235,7 @@ static gchar* video_source_collection_real_get_typename (MediaSourceCollection*
 	result = _tmp0_;
 #line 1102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10206 "VideoSupport.c"
+#line 10235 "VideoSupport.c"
 }
 
 
@@ -10227,7 +10256,7 @@ static gboolean video_source_collection_real_is_file_recognized (MediaSourceColl
 	result = _tmp1_;
 #line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10227 "VideoSupport.c"
+#line 10256 "VideoSupport.c"
 }
 
 
@@ -10246,7 +10275,7 @@ static void video_source_collection_on_trashcan_contents_altered (VideoSourceCol
 	_tmp1_ = removed;
 #line 1111 "/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 10246 "VideoSupport.c"
+#line 10275 "VideoSupport.c"
 }
 
 
@@ -10265,7 +10294,7 @@ static void video_source_collection_on_offline_contents_altered (VideoSourceColl
 	_tmp1_ = removed;
 #line 1117 "/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 10265 "VideoSupport.c"
+#line 10294 "VideoSupport.c"
 }
 
 
@@ -10287,7 +10316,7 @@ static MediaSource* video_source_collection_real_fetch_by_numeric_id (MediaSourc
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource);
 #line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10287 "VideoSupport.c"
+#line 10316 "VideoSupport.c"
 }
 
 
@@ -10322,7 +10351,7 @@ gint64 video_source_collection_get_video_key (DataSource* source) {
 	_g_object_unref0 (video);
 #line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10322 "VideoSupport.c"
+#line 10351 "VideoSupport.c"
 }
 
 
@@ -10340,7 +10369,7 @@ gboolean video_source_collection_is_video_trashed (DataSource* source) {
 	result = _tmp1_;
 #line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10340 "VideoSupport.c"
+#line 10369 "VideoSupport.c"
 }
 
 
@@ -10358,7 +10387,7 @@ gboolean video_source_collection_is_video_offline (DataSource* source) {
 	result = _tmp1_;
 #line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10358 "VideoSupport.c"
+#line 10387 "VideoSupport.c"
 }
 
 
@@ -10381,7 +10410,7 @@ Video* video_source_collection_fetch (VideoSourceCollection* self, VideoID* vide
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_VIDEO, Video);
 #line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10381 "VideoSupport.c"
+#line 10410 "VideoSupport.c"
 }
 
 
@@ -10413,7 +10442,7 @@ static GeeCollection* video_source_collection_real_get_event_source_ids (MediaSo
 	result = _tmp4_;
 #line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10413 "VideoSupport.c"
+#line 10442 "VideoSupport.c"
 }
 
 
@@ -10456,11 +10485,11 @@ Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, G
 		if (state) {
 #line 1153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10456 "VideoSupport.c"
+#line 10485 "VideoSupport.c"
 		}
 #line 1153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10460 "VideoSupport.c"
+#line 10489 "VideoSupport.c"
 	}
 #line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
@@ -10488,11 +10517,11 @@ Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, G
 		if (state) {
 #line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10488 "VideoSupport.c"
+#line 10517 "VideoSupport.c"
 		}
 #line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10492 "VideoSupport.c"
+#line 10521 "VideoSupport.c"
 	}
 #line 1163 "/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));
@@ -10520,11 +10549,11 @@ Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, G
 		if (state) {
 #line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10520 "VideoSupport.c"
+#line 10549 "VideoSupport.c"
 		}
 #line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10524 "VideoSupport.c"
+#line 10553 "VideoSupport.c"
 	}
 #line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_state = VIDEO_SOURCE_COLLECTION_STATE_UNKNOWN;
@@ -10536,11 +10565,11 @@ Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, G
 	if (state) {
 #line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*state = _vala_state;
-#line 10536 "VideoSupport.c"
+#line 10565 "VideoSupport.c"
 	}
 #line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10540 "VideoSupport.c"
+#line 10569 "VideoSupport.c"
 }
 
 
@@ -10574,7 +10603,7 @@ static void video_source_collection_compare_backing (VideoSourceCollection* self
 	if (_tmp1_ != ((guint64) _tmp3_)) {
 #line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 10574 "VideoSupport.c"
+#line 10603 "VideoSupport.c"
 	}
 #line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = video;
@@ -10588,7 +10617,7 @@ static void video_source_collection_compare_backing (VideoSourceCollection* self
 	_tmp8_ = _tmp7_.tv_sec;
 #line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp5_ == ((time_t) _tmp8_)) {
-#line 10588 "VideoSupport.c"
+#line 10617 "VideoSupport.c"
 		GeeCollection* _tmp9_ = NULL;
 		Video* _tmp10_ = NULL;
 #line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -10597,7 +10626,7 @@ static void video_source_collection_compare_backing (VideoSourceCollection* self
 		_tmp10_ = video;
 #line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		gee_collection_add (_tmp9_, _tmp10_);
-#line 10597 "VideoSupport.c"
+#line 10626 "VideoSupport.c"
 	}
 }
 
@@ -10609,7 +10638,7 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 	g_return_if_fail (G_IS_FILE_INFO (info));
 #line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matching_master));
-#line 10609 "VideoSupport.c"
+#line 10638 "VideoSupport.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
@@ -10630,7 +10659,7 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 		_object_it = _tmp3_;
 #line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10630 "VideoSupport.c"
+#line 10659 "VideoSupport.c"
 			GeeIterator* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
 			DataObject* object = NULL;
@@ -10647,7 +10676,7 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 			if (!_tmp5_) {
 #line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10647 "VideoSupport.c"
+#line 10676 "VideoSupport.c"
 			}
 #line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _object_it;
@@ -10665,11 +10694,11 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 			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"
 			_g_object_unref0 (object);
-#line 10665 "VideoSupport.c"
+#line 10694 "VideoSupport.c"
 		}
 #line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_object_it);
-#line 10669 "VideoSupport.c"
+#line 10698 "VideoSupport.c"
 	}
 	{
 		GeeIterator* _media_it = NULL;
@@ -10691,7 +10720,7 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 		_media_it = _tmp14_;
 #line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10691 "VideoSupport.c"
+#line 10720 "VideoSupport.c"
 			GeeIterator* _tmp15_ = NULL;
 			gboolean _tmp16_ = FALSE;
 			MediaSource* media = NULL;
@@ -10708,7 +10737,7 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 			if (!_tmp16_) {
 #line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10708 "VideoSupport.c"
+#line 10737 "VideoSupport.c"
 			}
 #line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = _media_it;
@@ -10726,11 +10755,11 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 			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"
 			_g_object_unref0 (media);
-#line 10726 "VideoSupport.c"
+#line 10755 "VideoSupport.c"
 		}
 #line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_media_it);
-#line 10730 "VideoSupport.c"
+#line 10759 "VideoSupport.c"
 	}
 }
 
@@ -10751,7 +10780,7 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 	_tmp0_ = added;
 #line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ != NULL) {
-#line 10751 "VideoSupport.c"
+#line 10780 "VideoSupport.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp1_ = NULL;
@@ -10764,7 +10793,7 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 			_object_it = _tmp2_;
 #line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 10764 "VideoSupport.c"
+#line 10793 "VideoSupport.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				DataObject* object = NULL;
@@ -10785,7 +10814,7 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 				if (!_tmp4_) {
 #line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 10785 "VideoSupport.c"
+#line 10814 "VideoSupport.c"
 				}
 #line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = _object_it;
@@ -10813,18 +10842,18 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 				_g_object_unref0 (video);
 #line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (object);
-#line 10813 "VideoSupport.c"
+#line 10842 "VideoSupport.c"
 			}
 #line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_object_it);
-#line 10817 "VideoSupport.c"
+#line 10846 "VideoSupport.c"
 		}
 	}
 #line 1201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = removed;
 #line 1201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp13_ != NULL) {
-#line 10824 "VideoSupport.c"
+#line 10853 "VideoSupport.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp14_ = NULL;
@@ -10837,7 +10866,7 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 			_object_it = _tmp15_;
 #line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 10837 "VideoSupport.c"
+#line 10866 "VideoSupport.c"
 				GeeIterator* _tmp16_ = NULL;
 				gboolean _tmp17_ = FALSE;
 				DataObject* object = NULL;
@@ -10858,7 +10887,7 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 				if (!_tmp17_) {
 #line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 10858 "VideoSupport.c"
+#line 10887 "VideoSupport.c"
 				}
 #line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = _object_it;
@@ -10886,11 +10915,11 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 				_g_object_unref0 (video);
 #line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (object);
-#line 10886 "VideoSupport.c"
+#line 10915 "VideoSupport.c"
 			}
 #line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_object_it);
-#line 10890 "VideoSupport.c"
+#line 10919 "VideoSupport.c"
 		}
 	}
 #line 1209 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -10899,7 +10928,7 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 	_tmp27_ = removed;
 #line 1209 "/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 10899 "VideoSupport.c"
+#line 10928 "VideoSupport.c"
 }
 
 
@@ -10909,7 +10938,7 @@ void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollect
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
 #line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (basename != NULL);
-#line 10909 "VideoSupport.c"
+#line 10938 "VideoSupport.c"
 	{
 		GeeIterator* _video_it = NULL;
 		GeeMultiMap* _tmp0_ = NULL;
@@ -10936,7 +10965,7 @@ void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollect
 		_video_it = _tmp5_;
 #line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10936 "VideoSupport.c"
+#line 10965 "VideoSupport.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			Video* video = NULL;
@@ -10957,7 +10986,7 @@ void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollect
 			if (!_tmp7_) {
 #line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10957 "VideoSupport.c"
+#line 10986 "VideoSupport.c"
 			}
 #line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = _video_it;
@@ -10983,7 +11012,7 @@ void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollect
 			_g_object_unref0 (_tmp12_);
 #line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp16_) {
-#line 10983 "VideoSupport.c"
+#line 11012 "VideoSupport.c"
 				Video* _tmp17_ = NULL;
 				VideoID _tmp18_ = {0};
 #line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -10998,15 +11027,15 @@ void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollect
 				_g_object_unref0 (_video_it);
 #line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 10998 "VideoSupport.c"
+#line 11027 "VideoSupport.c"
 			}
 #line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (video);
-#line 11002 "VideoSupport.c"
+#line 11031 "VideoSupport.c"
 		}
 #line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_video_it);
-#line 11006 "VideoSupport.c"
+#line 11035 "VideoSupport.c"
 	}
 #line 1218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id_init (&_tmp19_, VIDEO_ID_INVALID);
@@ -11014,7 +11043,7 @@ void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollect
 	*result = _tmp19_;
 #line 1218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return;
-#line 11014 "VideoSupport.c"
+#line 11043 "VideoSupport.c"
 }
 
 
@@ -11040,7 +11069,7 @@ gboolean video_source_collection_has_basename_filesize_duplicate (VideoSourceCol
 	result = _tmp3_;
 #line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 11040 "VideoSupport.c"
+#line 11069 "VideoSupport.c"
 }
 
 
@@ -11055,7 +11084,7 @@ static TransactionController* video_source_collection_real_get_transaction_contr
 	_tmp0_ = self->priv->_transaction_controller;
 #line 1067 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ == NULL) {
-#line 11055 "VideoSupport.c"
+#line 11084 "VideoSupport.c"
 		MediaSourceTransactionController* _tmp1_ = NULL;
 #line 1068 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = media_source_transaction_controller_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
@@ -11063,7 +11092,7 @@ static TransactionController* video_source_collection_real_get_transaction_contr
 		_transaction_controller_unref0 (self->priv->_transaction_controller);
 #line 1068 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		self->priv->_transaction_controller = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TRANSACTION_CONTROLLER, TransactionController);
-#line 11063 "VideoSupport.c"
+#line 11092 "VideoSupport.c"
 	}
 #line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = self->priv->_transaction_controller;
@@ -11071,7 +11100,7 @@ static TransactionController* video_source_collection_real_get_transaction_contr
 	result = _tmp2_;
 #line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 11071 "VideoSupport.c"
+#line 11100 "VideoSupport.c"
 }
 
 
@@ -11083,26 +11112,26 @@ static void video_source_collection_class_init (VideoSourceCollectionClass * kla
 #line 1057 "/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 = video_source_collection_real_create_trashcan;
+	((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 = video_source_collection_real_create_offline_bin;
+	((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 = video_source_collection_real_create_media_monitor;
+	((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 = video_source_collection_real_holds_type_of_source;
+	((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 = video_source_collection_real_get_typename;
+	((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 = video_source_collection_real_is_file_recognized;
+	((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 = video_source_collection_real_fetch_by_numeric_id;
+	((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 = video_source_collection_real_get_event_source_ids;
+	((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 = video_source_collection_real_notify_contents_altered;
+	((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"
 	MEDIA_SOURCE_COLLECTION_CLASS (klass)->get_transaction_controller = video_source_collection_real_get_transaction_controller;
-#line 11102 "VideoSupport.c"
+#line 11131 "VideoSupport.c"
 }
 
 
@@ -11113,10 +11142,10 @@ static void video_source_collection_instance_init (VideoSourceCollection * self)
 #line 1074 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->_transaction_controller = NULL;
 #line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = gee_tree_multi_map_new (G_TYPE_UINT64, (GBoxedCopyFunc) _uint64_dup, g_free, TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _uint64_compare_gcompare_data_func, NULL, NULL, NULL, NULL, NULL);
+	_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"
 	self->priv->filesize_to_video = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
-#line 11116 "VideoSupport.c"
+#line 11145 "VideoSupport.c"
 }
 
 
@@ -11130,7 +11159,7 @@ static void video_source_collection_finalize (DataCollection* obj) {
 	_g_object_unref0 (self->priv->filesize_to_video);
 #line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	DATA_COLLECTION_CLASS (video_source_collection_parent_class)->finalize (obj);
-#line 11130 "VideoSupport.c"
+#line 11159 "VideoSupport.c"
 }
 
 
diff --git a/src/camera/Branch.c b/src/camera/Branch.c
index 74b5c60..e41b06f 100644
--- a/src/camera/Branch.c
+++ b/src/camera/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.4, the Vala compiler
+/* Branch.c generated by valac 0.34.7, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -912,7 +912,7 @@ static void camera_branch_instance_init (CameraBranch * self) {
 #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"
-	_tmp0_ = gee_hash_map_new (TYPE_DISCOVERED_CAMERA, (GBoxedCopyFunc) discovered_camera_ref, discovered_camera_unref, CAMERA_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (TYPE_DISCOVERED_CAMERA, (GBoxedCopyFunc) discovered_camera_ref, (GDestroyNotify) discovered_camera_unref, CAMERA_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 10 "/home/jens/Source/shotwell/src/camera/Branch.vala"
 	self->priv->camera_map = _tmp0_;
 #line 919 "Branch.c"
@@ -1175,11 +1175,11 @@ 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 = 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 = 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 = 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"
diff --git a/src/camera/Camera.c b/src/camera/Camera.c
index f39dba0..a67eb27 100644
--- a/src/camera/Camera.c
+++ b/src/camera/Camera.c
@@ -1,4 +1,4 @@
-/* Camera.c generated by valac 0.34.4, the Vala compiler
+/* Camera.c generated by valac 0.34.7, 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 33dc872..bbf944b 100644
--- a/src/camera/CameraTable.c
+++ b/src/camera/CameraTable.c
@@ -1,4 +1,4 @@
-/* CameraTable.c generated by valac 0.34.4, the Vala compiler
+/* CameraTable.c generated by valac 0.34.7, the Vala compiler
  * generated from CameraTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -650,8 +650,8 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 	gboolean result = FALSE;
 	AppWindow* _tmp0_ = NULL;
 	LibraryWindow* _tmp1_ = NULL;
-	AppWindow* _tmp6_ = NULL;
-	LibraryWindow* _tmp7_ = NULL;
+	AppWindow* _tmp10_ = NULL;
+	LibraryWindow* _tmp11_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 57 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_val_if_fail (IS_CAMERA_TABLE (self), FALSE);
@@ -669,9 +669,11 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 		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"
+			gboolean _tmp2_ = FALSE;
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 675 "CameraTable.c"
+#line 677 "CameraTable.c"
 				goto __catch57_gphoto_error;
 			}
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -679,53 +681,57 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_clear_error (&_inner_error_);
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			return FALSE;
-#line 684 "CameraTable.c"
+			return _tmp2_;
+#line 686 "CameraTable.c"
 		}
 	}
 	goto __finally57;
 	__catch57_gphoto_error:
 	{
 		GError* err = NULL;
-		GError* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
+		GError* _tmp3_ = NULL;
+		const gchar* _tmp4_ = NULL;
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		err = _inner_error_;
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_inner_error_ = NULL;
 #line 65 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp2_ = err;
+		_tmp3_ = err;
 #line 65 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp3_ = _tmp2_->message;
+		_tmp4_ = _tmp3_->message;
 #line 65 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		g_warning ("CameraTable.vala:65: Unable to initialize camera table: %s", _tmp3_);
+		g_warning ("CameraTable.vala:65: Unable to initialize camera table: %s", _tmp4_);
 #line 67 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		result = FALSE;
 #line 67 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_error_free0 (err);
 #line 67 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return result;
-#line 709 "CameraTable.c"
+#line 711 "CameraTable.c"
 	}
 	__finally57:
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 716 "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);
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		g_clear_error (&_inner_error_);
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		return FALSE;
-#line 720 "CameraTable.c"
+		return _tmp5_;
+#line 724 "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"
+			gboolean _tmp6_ = FALSE;
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 729 "CameraTable.c"
+#line 735 "CameraTable.c"
 				goto __catch58_gphoto_error;
 			}
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -733,61 +739,63 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_clear_error (&_inner_error_);
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			return FALSE;
-#line 738 "CameraTable.c"
+			return _tmp6_;
+#line 744 "CameraTable.c"
 		}
 	}
 	goto __finally58;
 	__catch58_gphoto_error:
 	{
 		GError* err = NULL;
-		GError* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
+		GError* _tmp7_ = NULL;
+		const gchar* _tmp8_ = NULL;
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		err = _inner_error_;
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_inner_error_ = NULL;
 #line 73 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp4_ = err;
+		_tmp7_ = err;
 #line 73 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp5_ = _tmp4_->message;
+		_tmp8_ = _tmp7_->message;
 #line 73 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		g_warning ("CameraTable.vala:73: Unable to update camera table: %s", _tmp5_);
+		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 759 "CameraTable.c"
+#line 765 "CameraTable.c"
 	}
 	__finally58:
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 770 "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);
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		g_clear_error (&_inner_error_);
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		return FALSE;
-#line 770 "CameraTable.c"
+		return _tmp9_;
+#line 778 "CameraTable.c"
 	}
 #line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_tmp6_ = app_window_get_instance ();
+	_tmp10_ = app_window_get_instance ();
 #line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_LIBRARY_WINDOW, LibraryWindow);
+	_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	library_window_set_page_switching_enabled (_tmp7_, TRUE);
+	library_window_set_page_switching_enabled (_tmp11_, TRUE);
 #line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_g_object_unref0 (_tmp7_);
+	_g_object_unref0 (_tmp11_);
 #line 79 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	result = FALSE;
 #line 79 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 784 "CameraTable.c"
+#line 792 "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 791 "CameraTable.c"
+#line 799 "CameraTable.c"
 }
 
 
@@ -800,7 +808,7 @@ CameraTable* camera_table_get_instance (void) {
 	_tmp0_ = camera_table_instance;
 #line 83 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (_tmp0_ == NULL) {
-#line 804 "CameraTable.c"
+#line 812 "CameraTable.c"
 		CameraTable* _tmp1_ = NULL;
 #line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp1_ = camera_table_new ();
@@ -808,7 +816,7 @@ CameraTable* camera_table_get_instance (void) {
 		_camera_table_unref0 (camera_table_instance);
 #line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_instance = _tmp1_;
-#line 812 "CameraTable.c"
+#line 820 "CameraTable.c"
 	}
 #line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp2_ = camera_table_instance;
@@ -818,7 +826,7 @@ CameraTable* camera_table_get_instance (void) {
 	result = _tmp3_;
 #line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 822 "CameraTable.c"
+#line 830 "CameraTable.c"
 }
 
 
@@ -832,14 +840,14 @@ GeeIterable* camera_table_get_cameras (CameraTable* self) {
 #line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp0_ = self->priv->camera_map;
 #line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+	_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp2_ = _tmp1_;
 #line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable);
 #line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 843 "CameraTable.c"
+#line 851 "CameraTable.c"
 }
 
 
@@ -853,14 +861,14 @@ gint camera_table_get_count (CameraTable* self) {
 #line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp0_ = self->priv->camera_map;
 #line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_tmp1_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+	_tmp1_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp2_ = _tmp1_;
 #line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	result = _tmp2_;
 #line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 864 "CameraTable.c"
+#line 872 "CameraTable.c"
 }
 
 
@@ -883,7 +891,7 @@ 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 887 "CameraTable.c"
+#line 895 "CameraTable.c"
 }
 
 
@@ -898,7 +906,7 @@ 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 902 "CameraTable.c"
+#line 910 "CameraTable.c"
 		int _tmp1_ = 0;
 		const gchar* _tmp2_ = NULL;
 		int _tmp3_ = 0;
@@ -922,7 +930,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 926 "CameraTable.c"
+#line 934 "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);
@@ -930,7 +938,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 934 "CameraTable.c"
+#line 942 "CameraTable.c"
 		}
 	}
 }
@@ -961,7 +969,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 965 "CameraTable.c"
+#line 973 "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);
@@ -969,7 +977,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 973 "CameraTable.c"
+#line 981 "CameraTable.c"
 		}
 	}
 #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -988,7 +996,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 992 "CameraTable.c"
+#line 1000 "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);
@@ -996,7 +1004,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 1000 "CameraTable.c"
+#line 1008 "CameraTable.c"
 		}
 	}
 }
@@ -1005,7 +1013,7 @@ 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 1009 "CameraTable.c"
+#line 1017 "CameraTable.c"
 }
 
 
@@ -1016,20 +1024,20 @@ static void _vala_array_add66 (gchar*** array, int* length, int* size, gchar* va
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 1020 "CameraTable.c"
+#line 1028 "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 1026 "CameraTable.c"
+#line 1034 "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 1033 "CameraTable.c"
+#line 1041 "CameraTable.c"
 }
 
 
@@ -1038,7 +1046,7 @@ 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 1042 "CameraTable.c"
+#line 1050 "CameraTable.c"
 }
 
 
@@ -1072,7 +1080,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 1076 "CameraTable.c"
+#line 1084 "CameraTable.c"
 	{
 		GList* device_collection = NULL;
 		GList* device_it = NULL;
@@ -1080,14 +1088,14 @@ 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 1084 "CameraTable.c"
+#line 1092 "CameraTable.c"
 			GUdevDevice* _tmp4_ = NULL;
 			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 1091 "CameraTable.c"
+#line 1099 "CameraTable.c"
 			{
 				gchar* device_file = NULL;
 				GUdevDevice* _tmp5_ = NULL;
@@ -1108,7 +1116,7 @@ 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 1112 "CameraTable.c"
+#line 1120 "CameraTable.c"
 					GUdevDevice* _tmp11_ = NULL;
 					gboolean _tmp12_ = FALSE;
 #line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1117,15 +1125,15 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
 					_tmp12_ = g_udev_device_has_property (_tmp11_, "ID_GPHOTO2");
 #line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp9_ = _tmp12_;
-#line 1121 "CameraTable.c"
+#line 1129 "CameraTable.c"
 				} else {
 #line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp9_ = FALSE;
-#line 1125 "CameraTable.c"
+#line 1133 "CameraTable.c"
 				}
 #line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp9_) {
-#line 1129 "CameraTable.c"
+#line 1137 "CameraTable.c"
 					GUdevDevice* _tmp13_ = NULL;
 					gboolean _tmp14_ = FALSE;
 #line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1134,15 +1142,15 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
 					_tmp14_ = g_udev_device_has_property (_tmp13_, "GPHOTO2_DRIVER");
 #line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp8_ = _tmp14_;
-#line 1138 "CameraTable.c"
+#line 1146 "CameraTable.c"
 				} else {
 #line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp8_ = FALSE;
-#line 1142 "CameraTable.c"
+#line 1150 "CameraTable.c"
 				}
 #line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp8_) {
-#line 1146 "CameraTable.c"
+#line 1154 "CameraTable.c"
 					gint camera_bus = 0;
 					gint camera_device = 0;
 					const gchar* _tmp15_ = NULL;
@@ -1162,7 +1170,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
 					_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 1166 "CameraTable.c"
+#line 1174 "CameraTable.c"
 						const gchar* _tmp17_ = NULL;
 #line 129 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_tmp17_ = device_file;
@@ -1175,7 +1183,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 1178 "CameraTable.c"
+#line 1186 "CameraTable.c"
 					}
 #line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp18_ = camera_bus;
@@ -1201,13 +1209,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 1204 "CameraTable.c"
+#line 1212 "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 1210 "CameraTable.c"
+#line 1218 "CameraTable.c"
 			}
 		}
 	}
@@ -1219,7 +1227,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 1222 "CameraTable.c"
+#line 1230 "CameraTable.c"
 	}
 #line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	result = _tmp25_;
@@ -1227,7 +1235,7 @@ 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 1230 "CameraTable.c"
+#line 1238 "CameraTable.c"
 }
 
 
@@ -1269,7 +1277,7 @@ 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 1272 "CameraTable.c"
+#line 1280 "CameraTable.c"
 		gchar** _tmp5_ = NULL;
 		gint _tmp5__length1 = 0;
 #line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1278,15 +1286,15 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 		_tmp5__length1 = usb_cameras_length1;
 #line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp3_ = _tmp5__length1 == 1;
-#line 1281 "CameraTable.c"
+#line 1289 "CameraTable.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp3_ = FALSE;
-#line 1285 "CameraTable.c"
+#line 1293 "CameraTable.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (_tmp3_) {
-#line 1289 "CameraTable.c"
+#line 1297 "CameraTable.c"
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
 		const gchar* _tmp7_ = NULL;
@@ -1317,21 +1325,21 @@ 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 1320 "CameraTable.c"
+#line 1328 "CameraTable.c"
 		} else {
 #line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (_vala_full_port);
-#line 1324 "CameraTable.c"
+#line 1332 "CameraTable.c"
 		}
 #line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return result;
-#line 1328 "CameraTable.c"
+#line 1336 "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 1334 "CameraTable.c"
+#line 1342 "CameraTable.c"
 		const gchar* _tmp12_ = NULL;
 #line 170 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp12_ = port;
@@ -1343,15 +1351,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 1346 "CameraTable.c"
+#line 1354 "CameraTable.c"
 		} else {
 #line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (_vala_full_port);
-#line 1350 "CameraTable.c"
+#line 1358 "CameraTable.c"
 		}
 #line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return result;
-#line 1354 "CameraTable.c"
+#line 1362 "CameraTable.c"
 	}
 #line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp13_ = port;
@@ -1359,7 +1367,7 @@ 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 1362 "CameraTable.c"
+#line 1370 "CameraTable.c"
 		const gchar* _tmp15_ = NULL;
 #line 178 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp15_ = port;
@@ -1371,21 +1379,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 1374 "CameraTable.c"
+#line 1382 "CameraTable.c"
 		} else {
 #line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (_vala_full_port);
-#line 1378 "CameraTable.c"
+#line 1386 "CameraTable.c"
 		}
 #line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return result;
-#line 1382 "CameraTable.c"
+#line 1390 "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 1388 "CameraTable.c"
+#line 1396 "CameraTable.c"
 	{
 		gchar** usb_camera_collection = NULL;
 		gint usb_camera_collection_length1 = 0;
@@ -1397,14 +1405,14 @@ 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 1400 "CameraTable.c"
+#line 1408 "CameraTable.c"
 			gchar* _tmp17_ = NULL;
 			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 1407 "CameraTable.c"
+#line 1415 "CameraTable.c"
 			{
 				gint camera_bus = 0;
 				gint camera_device = 0;
@@ -1419,7 +1427,7 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 				_tmp19_ = sscanf (_tmp18_, "usb:%d,%d", &camera_bus, &camera_device);
 #line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp19_ < 2) {
-#line 1422 "CameraTable.c"
+#line 1430 "CameraTable.c"
 					const gchar* _tmp20_ = NULL;
 #line 186 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp20_ = usb_camera;
@@ -1429,7 +1437,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 1432 "CameraTable.c"
+#line 1440 "CameraTable.c"
 				}
 #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp22_ = bus;
@@ -1437,7 +1445,7 @@ 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 1440 "CameraTable.c"
+#line 1448 "CameraTable.c"
 					gint _tmp24_ = 0;
 					gint _tmp25_ = 0;
 #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1446,15 +1454,15 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 					_tmp25_ = camera_device;
 #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp21_ = _tmp24_ == _tmp25_;
-#line 1449 "CameraTable.c"
+#line 1457 "CameraTable.c"
 				} else {
 #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp21_ = FALSE;
-#line 1453 "CameraTable.c"
+#line 1461 "CameraTable.c"
 				}
 #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp21_) {
-#line 1457 "CameraTable.c"
+#line 1465 "CameraTable.c"
 					const gchar* _tmp26_ = NULL;
 					gchar* _tmp27_ = NULL;
 					const gchar* _tmp28_ = NULL;
@@ -1481,19 +1489,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 1484 "CameraTable.c"
+#line 1492 "CameraTable.c"
 					} else {
 #line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (_vala_full_port);
-#line 1488 "CameraTable.c"
+#line 1496 "CameraTable.c"
 					}
 #line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return result;
-#line 1492 "CameraTable.c"
+#line 1500 "CameraTable.c"
 				}
 #line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (usb_camera);
-#line 1496 "CameraTable.c"
+#line 1504 "CameraTable.c"
 			}
 		}
 	}
@@ -1508,15 +1516,15 @@ 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 1510 "CameraTable.c"
+#line 1518 "CameraTable.c"
 	} else {
 #line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_free0 (_vala_full_port);
-#line 1514 "CameraTable.c"
+#line 1522 "CameraTable.c"
 	}
 #line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 1518 "CameraTable.c"
+#line 1526 "CameraTable.c"
 }
 
 
@@ -1534,7 +1542,7 @@ gchar* camera_table_get_port_uri (const gchar* port) {
 	result = _tmp1_;
 #line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 1536 "CameraTable.c"
+#line 1544 "CameraTable.c"
 }
 
 
@@ -1557,7 +1565,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 1559 "CameraTable.c"
+#line 1567 "CameraTable.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -1565,7 +1573,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 1567 "CameraTable.c"
+#line 1575 "CameraTable.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -1577,7 +1585,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 1579 "CameraTable.c"
+#line 1587 "CameraTable.c"
 	}
 }
 
@@ -1601,21 +1609,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 1603 "CameraTable.c"
+#line 1611 "CameraTable.c"
 		glong _tmp2_ = 0L;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 1609 "CameraTable.c"
+#line 1617 "CameraTable.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 1613 "CameraTable.c"
+#line 1621 "CameraTable.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 1617 "CameraTable.c"
+#line 1625 "CameraTable.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -1627,7 +1635,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 1629 "CameraTable.c"
+#line 1637 "CameraTable.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -1637,13 +1645,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 1639 "CameraTable.c"
+#line 1647 "CameraTable.c"
 	}
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 1645 "CameraTable.c"
+#line 1653 "CameraTable.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -1657,7 +1665,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 1659 "CameraTable.c"
+#line 1667 "CameraTable.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -1667,13 +1675,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 1669 "CameraTable.c"
+#line 1677 "CameraTable.c"
 	}
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 1675 "CameraTable.c"
+#line 1683 "CameraTable.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1682,7 +1690,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 1684 "CameraTable.c"
+#line 1692 "CameraTable.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -1702,7 +1710,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 1704 "CameraTable.c"
+#line 1712 "CameraTable.c"
 }
 
 
@@ -1715,7 +1723,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	g_return_val_if_fail (old != NULL, NULL);
 #line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 1717 "CameraTable.c"
+#line 1725 "CameraTable.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -1746,7 +1754,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1748 "CameraTable.c"
+#line 1756 "CameraTable.c"
 				goto __catch59_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1755,7 +1763,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 1757 "CameraTable.c"
+#line 1765 "CameraTable.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
@@ -1771,7 +1779,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1773 "CameraTable.c"
+#line 1781 "CameraTable.c"
 				goto __catch59_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1782,7 +1790,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 1784 "CameraTable.c"
+#line 1792 "CameraTable.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
@@ -1796,7 +1804,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 1798 "CameraTable.c"
+#line 1806 "CameraTable.c"
 	}
 	goto __finally59;
 	__catch59_g_regex_error:
@@ -1810,7 +1818,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 1812 "CameraTable.c"
+#line 1820 "CameraTable.c"
 	}
 	__finally59:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1821,7 +1829,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
-#line 1823 "CameraTable.c"
+#line 1831 "CameraTable.c"
 	}
 }
 
@@ -1839,7 +1847,7 @@ 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 1841 "CameraTable.c"
+#line 1849 "CameraTable.c"
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -1866,19 +1874,19 @@ 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 1868 "CameraTable.c"
+#line 1876 "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 1874 "CameraTable.c"
+#line 1882 "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 1880 "CameraTable.c"
+#line 1888 "CameraTable.c"
 }
 
 
@@ -1894,7 +1902,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 1896 "CameraTable.c"
+#line 1904 "CameraTable.c"
 	{
 		GList* volume_collection = NULL;
 		GList* volume_it = NULL;
@@ -1902,14 +1910,14 @@ 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 1904 "CameraTable.c"
+#line 1912 "CameraTable.c"
 			GVolume* _tmp2_ = NULL;
 			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 1911 "CameraTable.c"
+#line 1919 "CameraTable.c"
 			{
 				GVolume* _tmp3_ = NULL;
 				gchar* _tmp4_ = NULL;
@@ -1930,7 +1938,7 @@ 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 1932 "CameraTable.c"
+#line 1940 "CameraTable.c"
 					GVolume* _tmp8_ = NULL;
 					gchar* _tmp9_ = NULL;
 #line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1945,22 +1953,22 @@ 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 1947 "CameraTable.c"
+#line 1955 "CameraTable.c"
 				}
 #line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_object_unref0 (volume);
-#line 1951 "CameraTable.c"
+#line 1959 "CameraTable.c"
 			}
 		}
 #line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		__g_list_free__g_object_unref0_0 (volume_collection);
-#line 1956 "CameraTable.c"
+#line 1964 "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 1962 "CameraTable.c"
+#line 1970 "CameraTable.c"
 }
 
 
@@ -1976,7 +1984,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 1978 "CameraTable.c"
+#line 1986 "CameraTable.c"
 	{
 		GList* volume_collection = NULL;
 		GList* volume_it = NULL;
@@ -1984,14 +1992,14 @@ 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 1986 "CameraTable.c"
+#line 1994 "CameraTable.c"
 			GVolume* _tmp2_ = NULL;
 			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 1993 "CameraTable.c"
+#line 2001 "CameraTable.c"
 			{
 				GVolume* _tmp3_ = NULL;
 				gchar* _tmp4_ = NULL;
@@ -2012,7 +2020,7 @@ 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 2014 "CameraTable.c"
+#line 2022 "CameraTable.c"
 					GVolume* _tmp8_ = NULL;
 					GIcon* _tmp9_ = NULL;
 					GIcon* _tmp10_ = NULL;
@@ -2038,29 +2046,29 @@ 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 2040 "CameraTable.c"
+#line 2048 "CameraTable.c"
 				}
 #line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_object_unref0 (volume);
-#line 2044 "CameraTable.c"
+#line 2052 "CameraTable.c"
 			}
 		}
 #line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		__g_list_free__g_object_unref0_0 (volume_collection);
-#line 2049 "CameraTable.c"
+#line 2057 "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 2055 "CameraTable.c"
+#line 2063 "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 2062 "CameraTable.c"
+#line 2070 "CameraTable.c"
 }
 
 
@@ -2071,13 +2079,13 @@ static void _vala_array_add67 (DiscoveredCamera*** array, int* length, int* size
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*array = g_renew (DiscoveredCamera*, *array, (*size) + 1);
-#line 2073 "CameraTable.c"
+#line 2081 "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 2079 "CameraTable.c"
+#line 2087 "CameraTable.c"
 }
 
 
@@ -2129,7 +2137,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 2131 "CameraTable.c"
+#line 2139 "CameraTable.c"
 		} else {
 #line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_port_info_list_free0 (port_info_list);
@@ -2139,7 +2147,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 2141 "CameraTable.c"
+#line 2149 "CameraTable.c"
 		}
 	}
 #line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2158,7 +2166,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 2160 "CameraTable.c"
+#line 2168 "CameraTable.c"
 		} else {
 #line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_port_info_list_free0 (port_info_list);
@@ -2168,7 +2176,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 2170 "CameraTable.c"
+#line 2178 "CameraTable.c"
 		}
 	}
 #line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2191,7 +2199,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 2193 "CameraTable.c"
+#line 2201 "CameraTable.c"
 		} else {
 #line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_list_unref0 (camera_list);
@@ -2203,7 +2211,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 2205 "CameraTable.c"
+#line 2213 "CameraTable.c"
 		}
 	}
 #line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2230,7 +2238,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 2232 "CameraTable.c"
+#line 2240 "CameraTable.c"
 		} else {
 #line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_list_unref0 (camera_list);
@@ -2242,11 +2250,11 @@ 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 2244 "CameraTable.c"
+#line 2252 "CameraTable.c"
 		}
 	}
 #line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	detected_map = _tmp11_;
 #line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2257,19 +2265,19 @@ 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 2259 "CameraTable.c"
+#line 2267 "CameraTable.c"
 	{
 		gint ctr = 0;
 #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		ctr = 0;
-#line 2264 "CameraTable.c"
+#line 2272 "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 2271 "CameraTable.c"
+#line 2279 "CameraTable.c"
 				gint _tmp16_ = 0;
 				CameraList* _tmp17_ = NULL;
 				gint _tmp18_ = 0;
@@ -2297,13 +2305,13 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 				const gchar* _tmp46_ = NULL;
 #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (!_tmp14_) {
-#line 2299 "CameraTable.c"
+#line 2307 "CameraTable.c"
 					gint _tmp15_ = 0;
 #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 2305 "CameraTable.c"
+#line 2313 "CameraTable.c"
 				}
 #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp14_ = FALSE;
@@ -2317,7 +2325,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 2319 "CameraTable.c"
+#line 2327 "CameraTable.c"
 				}
 #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp19_ = camera_list;
@@ -2351,7 +2359,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 2353 "CameraTable.c"
+#line 2361 "CameraTable.c"
 					} else {
 #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (name);
@@ -2369,7 +2377,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 2371 "CameraTable.c"
+#line 2379 "CameraTable.c"
 					}
 				}
 #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2406,7 +2414,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 2408 "CameraTable.c"
+#line 2416 "CameraTable.c"
 					} else {
 #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (port);
@@ -2426,7 +2434,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 2428 "CameraTable.c"
+#line 2436 "CameraTable.c"
 					}
 				}
 #line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2447,7 +2455,7 @@ 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 2449 "CameraTable.c"
+#line 2457 "CameraTable.c"
 					gchar* full_port = NULL;
 					CameraList* _tmp36_ = NULL;
 					gint _tmp37_ = 0;
@@ -2484,7 +2492,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 2486 "CameraTable.c"
+#line 2494 "CameraTable.c"
 					}
 #line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp42_ = full_port;
@@ -2496,7 +2504,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 2498 "CameraTable.c"
+#line 2506 "CameraTable.c"
 				}
 #line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp44_ = detected_map;
@@ -2510,7 +2518,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 2512 "CameraTable.c"
+#line 2520 "CameraTable.c"
 			}
 		}
 	}
@@ -2522,7 +2530,7 @@ 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 2524 "CameraTable.c"
+#line 2532 "CameraTable.c"
 	{
 		GeeIterator* _camera_it = NULL;
 		GeeHashMap* _tmp48_ = NULL;
@@ -2534,7 +2542,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 #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"
-		_tmp49_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_MAP, GeeMap));
+		_tmp49_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp50_ = _tmp49_;
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2549,7 +2557,7 @@ 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 2551 "CameraTable.c"
+#line 2559 "CameraTable.c"
 			GeeIterator* _tmp54_ = NULL;
 			gboolean _tmp55_ = FALSE;
 			DiscoveredCamera* camera = NULL;
@@ -2586,7 +2594,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 2588 "CameraTable.c"
+#line 2596 "CameraTable.c"
 			}
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp56_ = _camera_it;
@@ -2632,7 +2640,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 2634 "CameraTable.c"
+#line 2642 "CameraTable.c"
 				} else {
 #line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
@@ -2658,7 +2666,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 2660 "CameraTable.c"
+#line 2668 "CameraTable.c"
 				}
 			}
 #line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2709,7 +2717,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 2711 "CameraTable.c"
+#line 2719 "CameraTable.c"
 				} else {
 #line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (abilities);
@@ -2737,7 +2745,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 2739 "CameraTable.c"
+#line 2747 "CameraTable.c"
 				}
 			}
 #line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2748,7 +2756,7 @@ 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 2750 "CameraTable.c"
+#line 2758 "CameraTable.c"
 				CameraAbilities _tmp71_ = {0};
 				const gchar* _tmp72_ = NULL;
 				const gchar* _tmp73_ = NULL;
@@ -2770,7 +2778,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 2772 "CameraTable.c"
+#line 2780 "CameraTable.c"
 			}
 #line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp74_ = abilities;
@@ -2798,17 +2806,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 2800 "CameraTable.c"
+#line 2808 "CameraTable.c"
 		}
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_object_unref0 (_camera_it);
-#line 2804 "CameraTable.c"
+#line 2812 "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 2810 "CameraTable.c"
+#line 2818 "CameraTable.c"
 	{
 		DiscoveredCamera** camera_collection = NULL;
 		gint camera_collection_length1 = 0;
@@ -2820,14 +2828,14 @@ 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 2822 "CameraTable.c"
+#line 2830 "CameraTable.c"
 			DiscoveredCamera* _tmp81_ = NULL;
 			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 2829 "CameraTable.c"
+#line 2837 "CameraTable.c"
 			{
 				GPPortInfo port_info = {0};
 				gchar* tmp_path = NULL;
@@ -2886,7 +2894,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 2888 "CameraTable.c"
+#line 2896 "CameraTable.c"
 					} else {
 #line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (tmp_path);
@@ -2910,7 +2918,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 2912 "CameraTable.c"
+#line 2920 "CameraTable.c"
 					}
 				}
 #line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2959,7 +2967,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 2961 "CameraTable.c"
+#line 2969 "CameraTable.c"
 					} else {
 #line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						 (abilities);
@@ -2985,7 +2993,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 2987 "CameraTable.c"
+#line 2995 "CameraTable.c"
 					}
 				}
 #line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3020,7 +3028,7 @@ 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 3022 "CameraTable.c"
+#line 3030 "CameraTable.c"
 			}
 		}
 	}
@@ -3035,7 +3043,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp100_ = detected_map;
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp101_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_MAP, GeeMap));
+		_tmp101_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp102_ = _tmp101_;
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3050,7 +3058,7 @@ 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 3052 "CameraTable.c"
+#line 3060 "CameraTable.c"
 			GeeIterator* _tmp106_ = NULL;
 			gboolean _tmp107_ = FALSE;
 			gchar* port = NULL;
@@ -3142,7 +3150,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 3144 "CameraTable.c"
+#line 3152 "CameraTable.c"
 			}
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp108_ = _port_it;
@@ -3176,7 +3184,7 @@ 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 3178 "CameraTable.c"
+#line 3186 "CameraTable.c"
 				const gchar* _tmp118_ = NULL;
 				const gchar* _tmp119_ = NULL;
 #line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3197,7 +3205,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 3199 "CameraTable.c"
+#line 3207 "CameraTable.c"
 			}
 #line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp120_ = port;
@@ -3209,7 +3217,7 @@ 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 3211 "CameraTable.c"
+#line 3219 "CameraTable.c"
 				GUdevDevice* device = NULL;
 				GUdevClient* _tmp123_ = NULL;
 				const gchar* _tmp124_ = NULL;
@@ -3241,7 +3249,7 @@ 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 3243 "CameraTable.c"
+#line 3251 "CameraTable.c"
 					const gchar* _tmp130_ = NULL;
 					gchar* _tmp131_ = NULL;
 					const gchar* _tmp132_ = NULL;
@@ -3262,13 +3270,13 @@ 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 3264 "CameraTable.c"
+#line 3272 "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 3270 "CameraTable.c"
+#line 3278 "CameraTable.c"
 					GUdevDevice* _tmp135_ = NULL;
 					const gchar* _tmp136_ = NULL;
 					gchar* _tmp137_ = NULL;
@@ -3282,13 +3290,13 @@ 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 3284 "CameraTable.c"
+#line 3292 "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 3290 "CameraTable.c"
+#line 3298 "CameraTable.c"
 					GUdevDevice* _tmp139_ = NULL;
 					const gchar* _tmp140_ = NULL;
 					gchar* _tmp141_ = NULL;
@@ -3302,19 +3310,19 @@ 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 3304 "CameraTable.c"
+#line 3312 "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 3310 "CameraTable.c"
+#line 3318 "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 3316 "CameraTable.c"
+#line 3324 "CameraTable.c"
 				const gchar* _tmp143_ = NULL;
 				gchar* _tmp144_ = NULL;
 #line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3325,7 +3333,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 3327 "CameraTable.c"
+#line 3335 "CameraTable.c"
 			}
 #line 350 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp145_ = port_info_list;
@@ -3339,7 +3347,7 @@ 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 3341 "CameraTable.c"
+#line 3349 "CameraTable.c"
 				gint _tmp149_ = 0;
 				const gchar* _tmp150_ = NULL;
 				gchar* _tmp151_ = NULL;
@@ -3388,7 +3396,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 3390 "CameraTable.c"
+#line 3398 "CameraTable.c"
 					} else {
 #line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (path);
@@ -3420,7 +3428,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 3422 "CameraTable.c"
+#line 3430 "CameraTable.c"
 					}
 				}
 			}
@@ -3480,7 +3488,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 3482 "CameraTable.c"
+#line 3490 "CameraTable.c"
 				} else {
 #line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
@@ -3516,7 +3524,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 3518 "CameraTable.c"
+#line 3526 "CameraTable.c"
 				}
 			}
 #line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3545,7 +3553,7 @@ 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 3547 "CameraTable.c"
+#line 3555 "CameraTable.c"
 				gint _tmp168_ = 0;
 				const gchar* _tmp169_ = NULL;
 				gchar* _tmp170_ = NULL;
@@ -3598,7 +3606,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 3600 "CameraTable.c"
+#line 3608 "CameraTable.c"
 					} else {
 #line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (tmp_path);
@@ -3634,7 +3642,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 3636 "CameraTable.c"
+#line 3644 "CameraTable.c"
 					}
 				}
 			}
@@ -3696,7 +3704,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 3698 "CameraTable.c"
+#line 3706 "CameraTable.c"
 				} else {
 #line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (camera_abilities);
@@ -3734,7 +3742,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 3736 "CameraTable.c"
+#line 3744 "CameraTable.c"
 				}
 			}
 #line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3793,7 +3801,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 3795 "CameraTable.c"
+#line 3803 "CameraTable.c"
 				} else {
 #line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_camera_unref0 (gcamera);
@@ -3833,7 +3841,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 3835 "CameraTable.c"
+#line 3843 "CameraTable.c"
 				}
 			}
 #line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3892,7 +3900,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 3894 "CameraTable.c"
+#line 3902 "CameraTable.c"
 				} else {
 #line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_camera_unref0 (gcamera);
@@ -3932,7 +3940,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 3934 "CameraTable.c"
+#line 3942 "CameraTable.c"
 				}
 			}
 #line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3993,7 +4001,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 3995 "CameraTable.c"
+#line 4003 "CameraTable.c"
 				} else {
 #line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_camera_unref0 (gcamera);
@@ -4033,7 +4041,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 4035 "CameraTable.c"
+#line 4043 "CameraTable.c"
 				}
 			}
 #line 376 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4088,11 +4096,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 4090 "CameraTable.c"
+#line 4098 "CameraTable.c"
 		}
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_object_unref0 (_port_it);
-#line 4094 "CameraTable.c"
+#line 4102 "CameraTable.c"
 	}
 #line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
@@ -4104,7 +4112,7 @@ 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 4106 "CameraTable.c"
+#line 4114 "CameraTable.c"
 }
 
 
@@ -4131,7 +4139,7 @@ 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 4133 "CameraTable.c"
+#line 4141 "CameraTable.c"
 }
 
 
@@ -4145,7 +4153,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 4147 "CameraTable.c"
+#line 4155 "CameraTable.c"
 }
 
 
@@ -4153,7 +4161,7 @@ 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 4155 "CameraTable.c"
+#line 4163 "CameraTable.c"
 	{
 		CameraTable* _tmp0_ = NULL;
 		CameraTable* _tmp1_ = NULL;
@@ -4169,7 +4177,7 @@ 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 4171 "CameraTable.c"
+#line 4179 "CameraTable.c"
 				goto __catch60_gphoto_error;
 			}
 #line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4178,7 +4186,7 @@ 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 4180 "CameraTable.c"
+#line 4188 "CameraTable.c"
 		}
 	}
 	goto __finally60;
@@ -4199,7 +4207,7 @@ 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 4201 "CameraTable.c"
+#line 4209 "CameraTable.c"
 	}
 	__finally60:
 #line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4210,7 +4218,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 4212 "CameraTable.c"
+#line 4220 "CameraTable.c"
 	}
 }
 
@@ -4230,26 +4238,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 4232 "CameraTable.c"
+#line 4240 "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 4238 "CameraTable.c"
+#line 4246 "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 4244 "CameraTable.c"
+#line 4252 "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 4251 "CameraTable.c"
+#line 4259 "CameraTable.c"
 }
 
 
@@ -4258,7 +4266,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 4260 "CameraTable.c"
+#line 4268 "CameraTable.c"
 	}
 }
 
@@ -4268,11 +4276,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 4270 "CameraTable.c"
+#line 4278 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4274 "CameraTable.c"
+#line 4282 "CameraTable.c"
 	}
 }
 
@@ -4280,37 +4288,37 @@ 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 4282 "CameraTable.c"
+#line 4290 "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 4289 "CameraTable.c"
+#line 4297 "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 4296 "CameraTable.c"
+#line 4304 "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 4300 "CameraTable.c"
+#line 4308 "CameraTable.c"
 		}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = camera_table_ref (object);
-#line 4304 "CameraTable.c"
+#line 4312 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 4308 "CameraTable.c"
+#line 4316 "CameraTable.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return NULL;
-#line 4312 "CameraTable.c"
+#line 4320 "CameraTable.c"
 }
 
 
@@ -4321,25 +4329,25 @@ static gchar* value_camera_table_lcopy_value (const GValue* value, guint n_colle
 	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 4323 "CameraTable.c"
+#line 4331 "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 4329 "CameraTable.c"
+#line 4337 "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 4333 "CameraTable.c"
+#line 4341 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*object_p = camera_table_ref (value->data[0].v_pointer);
-#line 4337 "CameraTable.c"
+#line 4345 "CameraTable.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return NULL;
-#line 4341 "CameraTable.c"
+#line 4349 "CameraTable.c"
 }
 
 
@@ -4353,7 +4361,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 4355 "CameraTable.c"
+#line 4363 "CameraTable.c"
 }
 
 
@@ -4362,7 +4370,7 @@ 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 4364 "CameraTable.c"
+#line 4372 "CameraTable.c"
 }
 
 
@@ -4382,17 +4390,17 @@ 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 4384 "CameraTable.c"
+#line 4392 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 4388 "CameraTable.c"
+#line 4396 "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 4394 "CameraTable.c"
+#line 4402 "CameraTable.c"
 	}
 }
 
@@ -4411,17 +4419,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 4413 "CameraTable.c"
+#line 4421 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 4417 "CameraTable.c"
+#line 4425 "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 4423 "CameraTable.c"
+#line 4431 "CameraTable.c"
 	}
 }
 
@@ -4437,7 +4445,7 @@ static void camera_table_class_init (CameraTableClass * klass) {
 	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 4439 "CameraTable.c"
+#line 4447 "CameraTable.c"
 }
 
 
@@ -4458,12 +4466,12 @@ static void camera_table_instance_init (CameraTable * self) {
 #line 31 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	self->priv->null_context = _tmp1_;
 #line 35 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_DISCOVERED_CAMERA, (GBoxedCopyFunc) discovered_camera_ref, discovered_camera_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_DISCOVERED_CAMERA, (GBoxedCopyFunc) discovered_camera_ref, (GDestroyNotify) discovered_camera_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 35 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	self->priv->camera_map = _tmp2_;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	self->ref_count = 1;
-#line 4465 "CameraTable.c"
+#line 4473 "CameraTable.c"
 }
 
 
@@ -4485,7 +4493,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 4487 "CameraTable.c"
+#line 4495 "CameraTable.c"
 }
 
 
@@ -4510,7 +4518,7 @@ gpointer camera_table_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return instance;
-#line 4512 "CameraTable.c"
+#line 4520 "CameraTable.c"
 }
 
 
@@ -4523,7 +4531,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 4525 "CameraTable.c"
+#line 4533 "CameraTable.c"
 	}
 }
 
diff --git a/src/camera/GPhoto.c b/src/camera/GPhoto.c
index 41e795c..89722c6 100644
--- a/src/camera/GPhoto.c
+++ b/src/camera/GPhoto.c
@@ -1,4 +1,4 @@
-/* GPhoto.c generated by valac 0.34.4, the Vala compiler
+/* GPhoto.c generated by valac 0.34.7, the Vala compiler
  * generated from GPhoto.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -727,19 +727,19 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = gp_context_wrapper_real_progress_stop;
+	((GPContextWrapperClass *) klass)->progress_stop = (void (*)(GPContextWrapper*)) gp_context_wrapper_real_progress_stop;
 #line 744 "GPhoto.c"
 }
 
@@ -858,9 +858,9 @@ 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 = 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 = gp_spin_idle_wrapper_real_progress_update;
+	((GPContextWrapperClass *) klass)->progress_update = (void (*)(GPContextWrapper*, gfloat, void*)) gp_spin_idle_wrapper_real_progress_update;
 #line 865 "GPhoto.c"
 }
 
@@ -981,6 +981,7 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 		int _tmp18_ = 0;
 		const gchar* _tmp19_ = NULL;
 		GError* _tmp20_ = NULL;
+		gboolean _tmp21_ = FALSE;
 #line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15_ = res;
 #line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -998,8 +999,8 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 #line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
 #line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		return FALSE;
-#line 1003 "GPhoto.c"
+		return _tmp21_;
+#line 1004 "GPhoto.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = TRUE;
@@ -1007,15 +1008,15 @@ 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 1012 "GPhoto.c"
 	} else {
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		 (_vala_info);
-#line 1015 "GPhoto.c"
+#line 1016 "GPhoto.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1019 "GPhoto.c"
+#line 1020 "GPhoto.c"
 }
 
 
@@ -1048,7 +1049,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp2_ = start;
 #line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 1052 "GPhoto.c"
+#line 1053 "GPhoto.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1057,13 +1058,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp4_ = start;
 #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 1061 "GPhoto.c"
+#line 1062 "GPhoto.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 1067 "GPhoto.c"
+#line 1068 "GPhoto.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
 #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1072,13 +1073,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp7_ = end;
 #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 1076 "GPhoto.c"
+#line 1077 "GPhoto.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 1082 "GPhoto.c"
+#line 1083 "GPhoto.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1087,11 +1088,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp11_ = string_length;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 1091 "GPhoto.c"
+#line 1092 "GPhoto.c"
 	} else {
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 1095 "GPhoto.c"
+#line 1096 "GPhoto.c"
 	}
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
@@ -1099,7 +1100,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp13_ = end;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 1103 "GPhoto.c"
+#line 1104 "GPhoto.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1108,11 +1109,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp15_ = string_length;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 1112 "GPhoto.c"
+#line 1113 "GPhoto.c"
 	} else {
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 1116 "GPhoto.c"
+#line 1117 "GPhoto.c"
 	}
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
@@ -1134,7 +1135,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	result = _tmp21_;
 #line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 1138 "GPhoto.c"
+#line 1139 "GPhoto.c"
 }
 
 
@@ -1204,7 +1205,7 @@ 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"
+#line 1209 "GPhoto.c"
 		const gchar* _tmp10_ = NULL;
 		gint _tmp11_ = 0;
 		gint _tmp12_ = 0;
@@ -1230,7 +1231,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 1235 "GPhoto.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = NULL;
@@ -1242,13 +1243,13 @@ 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 1247 "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 1253 "GPhoto.c"
 	{
 		PhotoMetadata* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
@@ -1298,7 +1299,7 @@ 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"
+#line 1303 "GPhoto.c"
 			goto __catch61_g_error;
 		}
 	}
@@ -1313,7 +1314,7 @@ 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 1318 "GPhoto.c"
 	}
 	__finally61:
 #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1332,7 +1333,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 1337 "GPhoto.c"
 	}
 #line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = metadata;
@@ -1344,14 +1345,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 1349 "GPhoto.c"
 }
 
 
 static guint8* _vala_array_dup23 (guint8* self, int length) {
 #line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 1355 "GPhoto.c"
+#line 1356 "GPhoto.c"
 }
 
 
@@ -1392,7 +1393,7 @@ 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 1397 "GPhoto.c"
 	{
 		guint8* _tmp0_ = NULL;
 		GPContext* _tmp1_ = NULL;
@@ -1423,7 +1424,7 @@ 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"
+#line 1428 "GPhoto.c"
 			goto __catch62_g_error;
 		}
 #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1442,7 +1443,7 @@ 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 1447 "GPhoto.c"
 	}
 	goto __finally62;
 	__catch62_g_error:
@@ -1497,27 +1498,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 1502 "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 1506 "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 1512 "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 1518 "GPhoto.c"
 			}
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			return result;
-#line 1521 "GPhoto.c"
+#line 1522 "GPhoto.c"
 		}
 #line 159 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp14_ = metadata;
@@ -1533,27 +1534,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 1538 "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 1542 "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 1548 "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 1554 "GPhoto.c"
 			}
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			return result;
-#line 1557 "GPhoto.c"
+#line 1558 "GPhoto.c"
 		}
 #line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp16_ = metadata;
@@ -1581,7 +1582,7 @@ 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"
+#line 1586 "GPhoto.c"
 			goto __finally62;
 		}
 #line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1604,7 +1605,7 @@ 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 1609 "GPhoto.c"
 	}
 	__finally62:
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1613,7 +1614,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		g_propagate_error (error, _inner_error_);
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1617 "GPhoto.c"
+#line 1618 "GPhoto.c"
 	}
 #line 165 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp25_ = _vala_raw;
@@ -1629,27 +1630,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 1634 "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 1638 "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 1644 "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 1650 "GPhoto.c"
 		}
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 1653 "GPhoto.c"
+#line 1654 "GPhoto.c"
 	}
 #line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp26_ = _vala_raw;
@@ -1661,7 +1662,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 	_tmp27_ = _vala_raw_length;
 #line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp27_ > ((gsize) 32)) {
-#line 1665 "GPhoto.c"
+#line 1666 "GPhoto.c"
 		{
 			gsize i = 0UL;
 			gsize _tmp28_ = 0UL;
@@ -1669,14 +1670,14 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 			_tmp28_ = _vala_raw_length;
 #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			i = _tmp28_ - 2;
-#line 1673 "GPhoto.c"
+#line 1674 "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"
+#line 1681 "GPhoto.c"
 					gsize _tmp31_ = 0UL;
 					gsize _tmp32_ = 0UL;
 					gboolean _tmp33_ = FALSE;
@@ -1686,13 +1687,13 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 					guint8 _tmp36_ = 0U;
 #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 					if (!_tmp29_) {
-#line 1690 "GPhoto.c"
+#line 1691 "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 1697 "GPhoto.c"
 					}
 #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 					_tmp29_ = FALSE;
@@ -1704,7 +1705,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 					if (!(_tmp31_ > (_tmp32_ - 32))) {
 #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 						break;
-#line 1708 "GPhoto.c"
+#line 1709 "GPhoto.c"
 					}
 #line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 					_tmp34_ = _vala_raw;
@@ -1716,7 +1717,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 					_tmp36_ = _tmp34_[_tmp35_];
 #line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 					if (_tmp36_ == JPEG_MARKER_PREFIX) {
-#line 1720 "GPhoto.c"
+#line 1721 "GPhoto.c"
 						guint8* _tmp37_ = NULL;
 						gint _tmp37__length1 = 0;
 						gsize _tmp38_ = 0UL;
@@ -1731,15 +1732,15 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 						_tmp39_ = _tmp37_[_tmp38_ + 1];
 #line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 						_tmp33_ = _tmp39_ == JPEG_MARKER_EOI;
-#line 1735 "GPhoto.c"
+#line 1736 "GPhoto.c"
 					} else {
 #line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 						_tmp33_ = FALSE;
-#line 1739 "GPhoto.c"
+#line 1740 "GPhoto.c"
 					}
 #line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 					if (_tmp33_) {
-#line 1743 "GPhoto.c"
+#line 1744 "GPhoto.c"
 						const gchar* _tmp40_ = NULL;
 						gsize _tmp41_ = 0UL;
 #line 179 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1752,7 +1753,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 						_vala_raw_length = _tmp41_ + 2;
 #line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 						break;
-#line 1756 "GPhoto.c"
+#line 1757 "GPhoto.c"
 					}
 				}
 			}
@@ -1784,7 +1785,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		_g_object_unref0 (mins);
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1788 "GPhoto.c"
+#line 1789 "GPhoto.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp48_ = _tmp45_;
@@ -1800,27 +1801,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 	if (raw) {
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*raw = _vala_raw;
-#line 1804 "GPhoto.c"
+#line 1805 "GPhoto.c"
 	} else {
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_vala_raw = (g_free (_vala_raw), NULL);
-#line 1808 "GPhoto.c"
+#line 1809 "GPhoto.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (raw_length1) {
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*raw_length1 = _vala_raw_length1;
-#line 1814 "GPhoto.c"
+#line 1815 "GPhoto.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (raw_length) {
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*raw_length = _vala_raw_length;
-#line 1820 "GPhoto.c"
+#line 1821 "GPhoto.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1824 "GPhoto.c"
+#line 1825 "GPhoto.c"
 }
 
 
@@ -1864,7 +1865,7 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde
 		g_propagate_error (error, _inner_error_);
 #line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1868 "GPhoto.c"
+#line 1869 "GPhoto.c"
 	}
 #line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp5_ = ins;
@@ -1876,7 +1877,7 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde
 		_g_object_unref0 (ins);
 #line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 1880 "GPhoto.c"
+#line 1881 "GPhoto.c"
 	}
 #line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp7_ = ins;
@@ -1892,7 +1893,7 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde
 		_g_object_unref0 (ins);
 #line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1896 "GPhoto.c"
+#line 1897 "GPhoto.c"
 	}
 #line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp9_ = _tmp6_;
@@ -1906,7 +1907,7 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde
 	_g_object_unref0 (ins);
 #line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1910 "GPhoto.c"
+#line 1911 "GPhoto.c"
 }
 
 
@@ -1961,7 +1962,7 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con
 	_tmp5_ = fd;
 #line 201 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp5_ < 0) {
-#line 1965 "GPhoto.c"
+#line 1966 "GPhoto.c"
 		gint _tmp6_ = 0;
 		GFile* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
@@ -1988,7 +1989,7 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con
 		g_propagate_error (error, _inner_error_);
 #line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return;
-#line 1992 "GPhoto.c"
+#line 1993 "GPhoto.c"
 	}
 #line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp12_ = fd;
@@ -2004,7 +2005,7 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con
 	_tmp15_ = res;
 #line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp15_ != GP_OK) {
-#line 2008 "GPhoto.c"
+#line 2009 "GPhoto.c"
 		gint _tmp16_ = 0;
 		int _tmp17_ = 0;
 		int _tmp18_ = 0;
@@ -2030,7 +2031,7 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con
 		_gp_file_unref0 (camera_file);
 #line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return;
-#line 2034 "GPhoto.c"
+#line 2035 "GPhoto.c"
 	}
 #line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp21_ = camera;
@@ -2050,7 +2051,7 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con
 	_tmp27_ = res;
 #line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp27_ != GP_OK) {
-#line 2054 "GPhoto.c"
+#line 2055 "GPhoto.c"
 		gint _tmp28_ = 0;
 		int _tmp29_ = 0;
 		const gchar* _tmp30_ = NULL;
@@ -2082,7 +2083,7 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con
 		_gp_file_unref0 (camera_file);
 #line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return;
-#line 2086 "GPhoto.c"
+#line 2087 "GPhoto.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp35_ = fd;
@@ -2090,7 +2091,7 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con
 	close (_tmp35_);
 #line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 2094 "GPhoto.c"
+#line 2095 "GPhoto.c"
 }
 
 
@@ -2122,7 +2123,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
 	camera_raw_length1 = 0;
 #line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_camera_raw_size_ = camera_raw_length1;
-#line 2126 "GPhoto.c"
+#line 2127 "GPhoto.c"
 	{
 		guint8* _tmp0_ = NULL;
 		GPContext* _tmp1_ = NULL;
@@ -2153,7 +2154,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
 		__tmp0__size_ = _tmp0__length1;
 #line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2157 "GPhoto.c"
+#line 2158 "GPhoto.c"
 			goto __catch63_g_error;
 		}
 #line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -2174,7 +2175,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
 		_camera_raw_size_ = camera_raw_length1;
 #line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = (g_free (_tmp0_), NULL);
-#line 2178 "GPhoto.c"
+#line 2179 "GPhoto.c"
 	}
 	goto __finally63;
 	__catch63_g_error:
@@ -2204,7 +2205,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
 		camera_raw = (g_free (camera_raw), NULL);
 #line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2208 "GPhoto.c"
+#line 2209 "GPhoto.c"
 	}
 	__finally63:
 #line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -2215,7 +2216,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
 		camera_raw = (g_free (camera_raw), NULL);
 #line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2219 "GPhoto.c"
+#line 2220 "GPhoto.c"
 	}
 #line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp14_ = camera_raw;
@@ -2225,7 +2226,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
 	if (_tmp14_ == NULL) {
 #line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp13_ = TRUE;
-#line 2229 "GPhoto.c"
+#line 2230 "GPhoto.c"
 	} else {
 		guint8* _tmp15_ = NULL;
 		gint _tmp15__length1 = 0;
@@ -2235,7 +2236,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
 		_tmp15__length1 = camera_raw_length1;
 #line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp13_ = _tmp15__length1 == 0;
-#line 2239 "GPhoto.c"
+#line 2240 "GPhoto.c"
 	}
 #line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp13_) {
@@ -2245,7 +2246,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
 		camera_raw = (g_free (camera_raw), NULL);
 #line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2249 "GPhoto.c"
+#line 2250 "GPhoto.c"
 	}
 #line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp16_ = photo_metadata_new ();
@@ -2269,7 +2270,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
 		camera_raw = (g_free (camera_raw), NULL);
 #line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2273 "GPhoto.c"
+#line 2274 "GPhoto.c"
 	}
 #line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = metadata;
@@ -2277,21 +2278,21 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
 	camera_raw = (g_free (camera_raw), NULL);
 #line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 2281 "GPhoto.c"
+#line 2282 "GPhoto.c"
 }
 
 
 static guint8* _vala_array_dup24 (guint8* self, int length) {
 #line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 2288 "GPhoto.c"
+#line 2289 "GPhoto.c"
 }
 
 
 static void _gp_on_mins_destroyed_gdestroy_notify (void* data) {
 #line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_on_mins_destroyed (data);
-#line 2295 "GPhoto.c"
+#line 2296 "GPhoto.c"
 }
 
 
@@ -2350,7 +2351,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 	_tmp2_ = res;
 #line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp2_ != GP_OK) {
-#line 2354 "GPhoto.c"
+#line 2355 "GPhoto.c"
 		int _tmp3_ = 0;
 		int _tmp4_ = 0;
 		const gchar* _tmp5_ = NULL;
@@ -2371,7 +2372,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 		_gp_file_unref0 (camera_file);
 #line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2375 "GPhoto.c"
+#line 2376 "GPhoto.c"
 	}
 #line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp7_ = camera;
@@ -2391,7 +2392,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 	_tmp13_ = res;
 #line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp13_ != GP_OK) {
-#line 2395 "GPhoto.c"
+#line 2396 "GPhoto.c"
 		int _tmp14_ = 0;
 		const gchar* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
@@ -2418,7 +2419,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 		_gp_file_unref0 (camera_file);
 #line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2422 "GPhoto.c"
+#line 2423 "GPhoto.c"
 	}
 #line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp22_ = gp_file_get_data_and_size (camera_file, &_tmp20_, &_tmp21_);
@@ -2432,7 +2433,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 	_tmp23_ = res;
 #line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp23_ == GP_OK) {
-#line 2436 "GPhoto.c"
+#line 2437 "GPhoto.c"
 		guint8* buffer = NULL;
 		gulong _tmp24_ = 0UL;
 		guint8* _tmp25_ = NULL;
@@ -2488,7 +2489,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 		_gp_file_unref0 (camera_file);
 #line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2492 "GPhoto.c"
+#line 2493 "GPhoto.c"
 	}
 #line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp32_ = app_dirs_get_temp_dir ();
@@ -2518,7 +2519,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 	_tmp40_ = res;
 #line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp40_ != GP_OK) {
-#line 2522 "GPhoto.c"
+#line 2523 "GPhoto.c"
 		int _tmp41_ = 0;
 		const gchar* _tmp42_ = NULL;
 		const gchar* _tmp43_ = NULL;
@@ -2561,7 +2562,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 		_gp_file_unref0 (camera_file);
 #line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2565 "GPhoto.c"
+#line 2566 "GPhoto.c"
 	}
 #line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp52_ = temp;
@@ -2579,7 +2580,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 		_gp_file_unref0 (camera_file);
 #line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2583 "GPhoto.c"
+#line 2584 "GPhoto.c"
 	}
 #line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp54_ = _tmp51_;
@@ -2595,7 +2596,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 	_gp_file_unref0 (camera_file);
 #line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 2599 "GPhoto.c"
+#line 2600 "GPhoto.c"
 }
 
 
@@ -2605,7 +2606,7 @@ void gp_on_mins_destroyed (void* data) {
 	_tmp0_ = data;
 #line 278 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_free (_tmp0_);
-#line 2609 "GPhoto.c"
+#line 2610 "GPhoto.c"
 }
 
 
@@ -2664,7 +2665,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
 	_tmp2_ = res;
 #line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp2_ != GP_OK) {
-#line 2668 "GPhoto.c"
+#line 2669 "GPhoto.c"
 		int _tmp3_ = 0;
 		int _tmp4_ = 0;
 		const gchar* _tmp5_ = NULL;
@@ -2685,7 +2686,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
 		_gp_file_unref0 (camera_file);
 #line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2689 "GPhoto.c"
+#line 2690 "GPhoto.c"
 	}
 #line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp7_ = camera;
@@ -2707,7 +2708,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
 	_tmp14_ = res;
 #line 290 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp14_ != GP_OK) {
-#line 2711 "GPhoto.c"
+#line 2712 "GPhoto.c"
 		int _tmp15_ = 0;
 		const gchar* _tmp16_ = NULL;
 		const gchar* _tmp17_ = NULL;
@@ -2734,7 +2735,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
 		_gp_file_unref0 (camera_file);
 #line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2738 "GPhoto.c"
+#line 2739 "GPhoto.c"
 	}
 #line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp21_ = camera_file;
@@ -2750,7 +2751,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
 	_tmp25_ = res;
 #line 299 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp25_ != GP_OK) {
-#line 2754 "GPhoto.c"
+#line 2755 "GPhoto.c"
 		guint8* _tmp26_ = NULL;
 		gint _tmp26__length1 = 0;
 #line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -2761,7 +2762,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
 		if (result_length1) {
 #line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			*result_length1 = _tmp26__length1;
-#line 2765 "GPhoto.c"
+#line 2766 "GPhoto.c"
 		}
 #line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = _tmp26_;
@@ -2769,7 +2770,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
 		_gp_file_unref0 (camera_file);
 #line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2773 "GPhoto.c"
+#line 2774 "GPhoto.c"
 	}
 #line 302 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp27_ = data_len;
@@ -2801,7 +2802,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
 	if (result_length1) {
 #line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*result_length1 = _tmp32__length1;
-#line 2805 "GPhoto.c"
+#line 2806 "GPhoto.c"
 	}
 #line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = _tmp32_;
@@ -2809,7 +2810,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
 	_gp_file_unref0 (camera_file);
 #line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 2813 "GPhoto.c"
+#line 2814 "GPhoto.c"
 }
 
 
diff --git a/src/camera/ImportPage.c b/src/camera/ImportPage.c
index f967876..e049511 100644
--- a/src/camera/ImportPage.c
+++ b/src/camera/ImportPage.c
@@ -1,4 +1,4 @@
-/* ImportPage.c generated by valac 0.34.4, the Vala compiler
+/* ImportPage.c generated by valac 0.34.7, the Vala compiler
  * generated from ImportPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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"
 }
 
@@ -2552,19 +2552,19 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
 	gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	int _result_ = 0;
-	Camera* _tmp10_ = NULL;
 	Camera* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
+	Camera* _tmp12_ = NULL;
+	const gchar* _tmp13_ = NULL;
 	gchar* _tmp14_ = NULL;
-	GPSpinIdleWrapper* _tmp15_ = NULL;
-	GPContext* _tmp16_ = NULL;
-	int _tmp17_ = 0;
+	gchar* _tmp15_ = NULL;
+	GPSpinIdleWrapper* _tmp16_ = NULL;
+	GPContext* _tmp17_ = NULL;
 	int _tmp18_ = 0;
 	int _tmp19_ = 0;
-	gboolean _tmp26_ = FALSE;
+	int _tmp20_ = 0;
 	gboolean _tmp27_ = FALSE;
 	gboolean _tmp28_ = FALSE;
+	gboolean _tmp29_ = FALSE;
 	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);
@@ -2608,13 +2608,15 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
 		_tmp8_ = _tmp9_;
 #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 2611 "ImportPage.c"
+			gboolean _tmp10_ = FALSE;
 #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			g_propagate_error (error, _inner_error_);
 #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (fulldir);
 #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			return FALSE;
-#line 2617 "ImportPage.c"
+			return _tmp10_;
+#line 2619 "ImportPage.c"
 		}
 #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = _tmp8_;
@@ -2622,98 +2624,100 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
 		_g_free0 (fulldir);
 #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 2625 "ImportPage.c"
+#line 2627 "ImportPage.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp10_ = import_source_get_camera (self);
+	_tmp11_ = import_source_get_camera (self);
 #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp11_ = _tmp10_;
+	_tmp12_ = _tmp11_;
 #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp12_ = fulldir;
+	_tmp13_ = fulldir;
 #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp13_ = import_source_get_filename (self);
+	_tmp14_ = import_source_get_filename (self);
 #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp14_ = _tmp13_;
+	_tmp15_ = _tmp14_;
 #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp15_ = import_page_spin_idle_context;
+	_tmp16_ = import_page_spin_idle_context;
 #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
 #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp17_ = gp_camera_file_delete (_tmp11_, _tmp12_, _tmp14_, _tmp16_);
+	_tmp18_ = gp_camera_file_delete (_tmp12_, _tmp13_, _tmp15_, _tmp17_);
 #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp18_ = _tmp17_;
+	_tmp19_ = _tmp18_;
 #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_g_free0 (_tmp14_);
+	_g_free0 (_tmp15_);
 #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_gp_camera_unref0 (_tmp11_);
+	_gp_camera_unref0 (_tmp12_);
 #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_result_ = _tmp18_;
+	_result_ = _tmp19_;
 #line 100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp19_ = _result_;
+	_tmp20_ = _result_;
 #line 100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp19_ != GP_OK) {
-#line 2655 "ImportPage.c"
-		gchar* _tmp20_ = NULL;
+	if (_tmp20_ != GP_OK) {
+#line 2657 "ImportPage.c"
 		gchar* _tmp21_ = NULL;
-		const gchar* _tmp22_ = NULL;
-		int _tmp23_ = 0;
-		gchar* _tmp24_ = NULL;
+		gchar* _tmp22_ = NULL;
+		const gchar* _tmp23_ = NULL;
+		int _tmp24_ = 0;
 		gchar* _tmp25_ = NULL;
+		gchar* _tmp26_ = NULL;
 #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp20_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
+		_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"
-		_tmp21_ = _tmp20_;
+		_tmp22_ = _tmp21_;
 #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp22_ = self->priv->camera_name;
+		_tmp23_ = self->priv->camera_name;
 #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp23_ = _result_;
+		_tmp24_ = _result_;
 #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp24_ = gp_result_to_full_string (_tmp23_);
+		_tmp25_ = gp_result_to_full_string (_tmp24_);
 #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp25_ = _tmp24_;
+		_tmp26_ = _tmp25_;
 #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_warning ("ImportPage.vala:101: Error deleting %s from %s: %s", _tmp21_, _tmp22_, _tmp25_);
+		g_warning ("ImportPage.vala:101: Error deleting %s from %s: %s", _tmp22_, _tmp23_, _tmp26_);
 #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_free0 (_tmp25_);
+		_g_free0 (_tmp26_);
 #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_free0 (_tmp21_);
-#line 2680 "ImportPage.c"
+		_g_free0 (_tmp22_);
+#line 2682 "ImportPage.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp28_ = DATA_SOURCE_CLASS (import_source_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_);
+	_tmp29_ = DATA_SOURCE_CLASS (import_source_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_);
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp27_ = _tmp28_;
+	_tmp28_ = _tmp29_;
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 2690 "ImportPage.c"
+		gboolean _tmp30_ = FALSE;
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_propagate_error (error, _inner_error_);
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		return FALSE;
-#line 2694 "ImportPage.c"
+		return _tmp30_;
+#line 2698 "ImportPage.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp27_) {
-#line 2698 "ImportPage.c"
-		int _tmp29_ = 0;
+	if (_tmp28_) {
+#line 2702 "ImportPage.c"
+		int _tmp31_ = 0;
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp29_ = _result_;
+		_tmp31_ = _result_;
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp26_ = _tmp29_ == GP_OK;
-#line 2704 "ImportPage.c"
+		_tmp27_ = _tmp31_ == GP_OK;
+#line 2708 "ImportPage.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp26_ = FALSE;
-#line 2708 "ImportPage.c"
+		_tmp27_ = FALSE;
+#line 2712 "ImportPage.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	result = _tmp26_;
+	result = _tmp27_;
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (fulldir);
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2716 "ImportPage.c"
+#line 2720 "ImportPage.c"
 }
 
 
@@ -2729,7 +2733,7 @@ static const gchar* import_source_real_get_indexable_keywords (Indexable* base)
 	result = _tmp0_;
 #line 107 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2732 "ImportPage.c"
+#line 2736 "ImportPage.c"
 }
 
 
@@ -2739,16 +2743,16 @@ 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 = 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 = 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 = 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 = 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 2751 "ImportPage.c"
+#line 2755 "ImportPage.c"
 }
 
 
@@ -2757,7 +2761,7 @@ static void import_source_indexable_interface_init (IndexableIface * iface) {
 	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;
-#line 2760 "ImportPage.c"
+#line 2764 "ImportPage.c"
 }
 
 
@@ -2768,7 +2772,7 @@ static void import_source_instance_init (ImportSource * self) {
 	self->priv->preview = NULL;
 #line 26 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->indexable_keywords = NULL;
-#line 2771 "ImportPage.c"
+#line 2775 "ImportPage.c"
 }
 
 
@@ -2790,7 +2794,7 @@ static void import_source_finalize (GObject* obj) {
 	_g_free0 (self->priv->indexable_keywords);
 #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (import_source_parent_class)->finalize (obj);
-#line 2793 "ImportPage.c"
+#line 2797 "ImportPage.c"
 }
 
 
@@ -2843,14 +2847,14 @@ VideoImportSource* video_import_source_construct (GType object_type, const gchar
 	self = (VideoImportSource*) import_source_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_);
 #line 112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 2846 "ImportPage.c"
+#line 2850 "ImportPage.c"
 }
 
 
 VideoImportSource* video_import_source_new (const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time) {
 #line 112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return video_import_source_construct (TYPE_VIDEO_IMPORT_SOURCE, camera_name, camera, fsid, folder, filename, file_size, modification_time);
-#line 2853 "ImportPage.c"
+#line 2857 "ImportPage.c"
 }
 
 
@@ -2876,7 +2880,7 @@ static GdkPixbuf* video_import_source_real_get_thumbnail (ThumbnailSource* base,
 		g_propagate_error (error, _inner_error_);
 #line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return NULL;
-#line 2879 "ImportPage.c"
+#line 2883 "ImportPage.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = _tmp0_;
@@ -2888,7 +2892,7 @@ static GdkPixbuf* video_import_source_real_get_thumbnail (ThumbnailSource* base,
 	_g_object_unref0 (_tmp0_);
 #line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2891 "ImportPage.c"
+#line 2895 "ImportPage.c"
 }
 
 
@@ -2916,13 +2920,13 @@ static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* ba
 		result = NULL;
 #line 123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 2919 "ImportPage.c"
+#line 2923 "ImportPage.c"
 	}
 #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = scale;
 #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp4_ > 0) {
-#line 2925 "ImportPage.c"
+#line 2929 "ImportPage.c"
 		GdkPixbuf* _tmp5_ = NULL;
 		GdkPixbuf* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
@@ -2941,7 +2945,7 @@ static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* ba
 		_tmp3_ = _tmp8_;
 #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 2944 "ImportPage.c"
+#line 2948 "ImportPage.c"
 	} else {
 		GdkPixbuf* _tmp9_ = NULL;
 #line 128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2950,13 +2954,13 @@ static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* ba
 		_g_object_unref0 (_tmp3_);
 #line 128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = _tmp9_;
-#line 2953 "ImportPage.c"
+#line 2957 "ImportPage.c"
 	}
 #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp3_;
 #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2959 "ImportPage.c"
+#line 2963 "ImportPage.c"
 }
 
 
@@ -2972,7 +2976,7 @@ static gchar* video_import_source_real_get_typename (DataSource* base) {
 	result = _tmp0_;
 #line 132 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2975 "ImportPage.c"
+#line 2979 "ImportPage.c"
 }
 
 
@@ -2988,7 +2992,7 @@ static gint64 video_import_source_real_get_instance_id (DataSource* base) {
 	result = _tmp0_;
 #line 136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2991 "ImportPage.c"
+#line 2995 "ImportPage.c"
 }
 
 
@@ -3004,7 +3008,7 @@ static PhotoFileFormat video_import_source_real_get_preferred_thumbnail_format (
 	result = _tmp0_;
 #line 140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3007 "ImportPage.c"
+#line 3011 "ImportPage.c"
 }
 
 
@@ -3020,7 +3024,7 @@ static gchar* video_import_source_real_get_name (DataObject* base) {
 	result = _tmp0_;
 #line 144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3023 "ImportPage.c"
+#line 3027 "ImportPage.c"
 }
 
 
@@ -3035,7 +3039,7 @@ void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview) {
 	_tmp1_ = preview;
 #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_ != NULL) {
-#line 3038 "ImportPage.c"
+#line 3042 "ImportPage.c"
 		GdkPixbuf* _tmp2_ = NULL;
 		GdkPixbuf* _tmp3_ = NULL;
 #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3046,7 +3050,7 @@ void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview) {
 		_g_object_unref0 (_tmp0_);
 #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp3_;
-#line 3049 "ImportPage.c"
+#line 3053 "ImportPage.c"
 	} else {
 		GdkPixbuf* _tmp4_ = NULL;
 #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3055,13 +3059,13 @@ void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview) {
 		_g_object_unref0 (_tmp0_);
 #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp4_;
-#line 3058 "ImportPage.c"
+#line 3062 "ImportPage.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_source_set_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource), _tmp0_);
 #line 147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp0_);
-#line 3064 "ImportPage.c"
+#line 3068 "ImportPage.c"
 }
 
 
@@ -3069,18 +3073,18 @@ 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 = 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 = 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 = 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 = 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 = 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 = video_import_source_real_get_name;
-#line 3083 "ImportPage.c"
+	((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) video_import_source_real_get_name;
+#line 3087 "ImportPage.c"
 }
 
 
@@ -3140,14 +3144,14 @@ PhotoImportSource* photo_import_source_construct (GType object_type, const gchar
 	self->priv->file_format = _tmp7_;
 #line 161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 3143 "ImportPage.c"
+#line 3147 "ImportPage.c"
 }
 
 
 PhotoImportSource* photo_import_source_new (const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time, PhotoFileFormat file_format) {
 #line 161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return photo_import_source_construct (TYPE_PHOTO_IMPORT_SOURCE, camera_name, camera, fsid, folder, filename, file_size, modification_time, file_format);
-#line 3150 "ImportPage.c"
+#line 3154 "ImportPage.c"
 }
 
 
@@ -3171,7 +3175,7 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
 	_tmp3_ = is_string_empty (_tmp2_);
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp3_) {
-#line 3174 "ImportPage.c"
+#line 3178 "ImportPage.c"
 		const gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3182,7 +3186,7 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
 		_g_free0 (_tmp1_);
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = _tmp5_;
-#line 3185 "ImportPage.c"
+#line 3189 "ImportPage.c"
 	} else {
 		gchar* _tmp6_ = NULL;
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3191,7 +3195,7 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
 		_g_free0 (_tmp1_);
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = _tmp6_;
-#line 3194 "ImportPage.c"
+#line 3198 "ImportPage.c"
 	}
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
@@ -3199,7 +3203,7 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
 	_g_free0 (title);
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3202 "ImportPage.c"
+#line 3206 "ImportPage.c"
 }
 
 
@@ -3215,7 +3219,7 @@ static gchar* photo_import_source_real_get_typename (DataSource* base) {
 	result = _tmp0_;
 #line 174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3218 "ImportPage.c"
+#line 3222 "ImportPage.c"
 }
 
 
@@ -3231,7 +3235,7 @@ static gint64 photo_import_source_real_get_instance_id (DataSource* base) {
 	result = _tmp0_;
 #line 178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3234 "ImportPage.c"
+#line 3238 "ImportPage.c"
 }
 
 
@@ -3249,26 +3253,26 @@ static PhotoFileFormat photo_import_source_real_get_preferred_thumbnail_format (
 	_tmp2_ = photo_file_format_can_write (_tmp1_);
 #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp2_) {
-#line 3252 "ImportPage.c"
+#line 3256 "ImportPage.c"
 		PhotoFileFormat _tmp3_ = 0;
 #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 3258 "ImportPage.c"
+#line 3262 "ImportPage.c"
 	} else {
 		PhotoFileFormat _tmp4_ = 0;
 #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"
 		_tmp0_ = _tmp4_;
-#line 3265 "ImportPage.c"
+#line 3269 "ImportPage.c"
 	}
 #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
 #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3271 "ImportPage.c"
+#line 3275 "ImportPage.c"
 }
 
 
@@ -3296,13 +3300,13 @@ static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* ba
 		result = NULL;
 #line 188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 3299 "ImportPage.c"
+#line 3303 "ImportPage.c"
 	}
 #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = scale;
 #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp4_ > 0) {
-#line 3305 "ImportPage.c"
+#line 3309 "ImportPage.c"
 		GdkPixbuf* _tmp5_ = NULL;
 		GdkPixbuf* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
@@ -3321,7 +3325,7 @@ static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* ba
 		_tmp3_ = _tmp8_;
 #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 3324 "ImportPage.c"
+#line 3328 "ImportPage.c"
 	} else {
 		GdkPixbuf* _tmp9_ = NULL;
 #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3330,20 +3334,20 @@ static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* ba
 		_g_object_unref0 (_tmp3_);
 #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = _tmp9_;
-#line 3333 "ImportPage.c"
+#line 3337 "ImportPage.c"
 	}
 #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp3_;
 #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3339 "ImportPage.c"
+#line 3343 "ImportPage.c"
 }
 
 
 static gpointer _media_metadata_ref0 (gpointer self) {
 #line 199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? media_metadata_ref (self) : NULL;
-#line 3346 "ImportPage.c"
+#line 3350 "ImportPage.c"
 }
 
 
@@ -3389,7 +3393,7 @@ void photo_import_source_update (PhotoImportSource* self, GdkPixbuf* preview, co
 	_g_free0 (self->priv->exif_md5);
 #line 200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->exif_md5 = _tmp6_;
-#line 3392 "ImportPage.c"
+#line 3396 "ImportPage.c"
 }
 
 
@@ -3408,7 +3412,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
 	_tmp0_ = self->priv->metadata;
 #line 204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ == NULL) {
-#line 3411 "ImportPage.c"
+#line 3415 "ImportPage.c"
 		time_t _tmp1_ = 0;
 #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));
@@ -3416,7 +3420,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
 		result = _tmp1_;
 #line 205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 3419 "ImportPage.c"
+#line 3423 "ImportPage.c"
 	}
 #line 207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->metadata;
@@ -3428,7 +3432,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
 	_tmp5_ = date_time;
 #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_ != NULL) {
-#line 3431 "ImportPage.c"
+#line 3435 "ImportPage.c"
 		MetadataDateTime* _tmp6_ = NULL;
 		time_t _tmp7_ = 0;
 #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3437,14 +3441,14 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
 		_tmp7_ = metadata_date_time_get_timestamp (_tmp6_);
 #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = _tmp7_;
-#line 3440 "ImportPage.c"
+#line 3444 "ImportPage.c"
 	} else {
 		time_t _tmp8_ = 0;
 #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"
 		_tmp4_ = _tmp8_;
-#line 3447 "ImportPage.c"
+#line 3451 "ImportPage.c"
 	}
 #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp4_;
@@ -3452,7 +3456,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
 	_metadata_date_time_unref0 (date_time);
 #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3455 "ImportPage.c"
+#line 3459 "ImportPage.c"
 }
 
 
@@ -3466,7 +3470,7 @@ gchar* photo_import_source_get_title (PhotoImportSource* self) {
 	_tmp1_ = self->priv->metadata;
 #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_ != NULL) {
-#line 3469 "ImportPage.c"
+#line 3473 "ImportPage.c"
 		PhotoMetadata* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3477,19 +3481,19 @@ gchar* photo_import_source_get_title (PhotoImportSource* self) {
 		_g_free0 (_tmp0_);
 #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp3_;
-#line 3480 "ImportPage.c"
+#line 3484 "ImportPage.c"
 	} else {
 #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp0_);
 #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = NULL;
-#line 3486 "ImportPage.c"
+#line 3490 "ImportPage.c"
 	}
 #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
 #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3492 "ImportPage.c"
+#line 3496 "ImportPage.c"
 }
 
 
@@ -3504,7 +3508,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
 	_tmp0_ = self->priv->associated;
 #line 217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ != NULL) {
-#line 3507 "ImportPage.c"
+#line 3511 "ImportPage.c"
 		PhotoImportSource* _tmp1_ = NULL;
 		PhotoMetadata* _tmp2_ = NULL;
 #line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3515,7 +3519,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
 		result = _tmp2_;
 #line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 3518 "ImportPage.c"
+#line 3522 "ImportPage.c"
 	}
 #line 220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = self->priv->metadata;
@@ -3525,7 +3529,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
 	result = _tmp4_;
 #line 220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3528 "ImportPage.c"
+#line 3532 "ImportPage.c"
 }
 
 
@@ -3542,7 +3546,7 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
 	_tmp0_ = self->priv->associated;
 #line 224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ != NULL) {
-#line 3545 "ImportPage.c"
+#line 3549 "ImportPage.c"
 		PhotoImportSource* _tmp1_ = NULL;
 		GdkPixbuf* _tmp2_ = NULL;
 #line 225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3553,7 +3557,7 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
 		result = _tmp2_;
 #line 225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 3556 "ImportPage.c"
+#line 3560 "ImportPage.c"
 	}
 #line 227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = IMPORT_SOURCE_CLASS (photo_import_source_parent_class)->get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
@@ -3565,7 +3569,7 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
 	_g_object_unref0 (_tmp4_);
 #line 227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_) {
-#line 3568 "ImportPage.c"
+#line 3572 "ImportPage.c"
 		GdkPixbuf* _tmp6_ = NULL;
 #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));
@@ -3573,13 +3577,13 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
 		result = _tmp6_;
 #line 228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 3576 "ImportPage.c"
+#line 3580 "ImportPage.c"
 	}
 #line 230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = NULL;
 #line 230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3582 "ImportPage.c"
+#line 3586 "ImportPage.c"
 }
 
 
@@ -3607,13 +3611,13 @@ static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base,
 		result = NULL;
 #line 235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 3610 "ImportPage.c"
+#line 3614 "ImportPage.c"
 	}
 #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = scale;
 #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp4_ > 0) {
-#line 3616 "ImportPage.c"
+#line 3620 "ImportPage.c"
 		GdkPixbuf* _tmp5_ = NULL;
 		GdkPixbuf* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
@@ -3632,7 +3636,7 @@ static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base,
 		_tmp3_ = _tmp8_;
 #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 3635 "ImportPage.c"
+#line 3639 "ImportPage.c"
 	} else {
 		GdkPixbuf* _tmp9_ = NULL;
 #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3641,13 +3645,13 @@ static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base,
 		_g_object_unref0 (_tmp3_);
 #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = _tmp9_;
-#line 3644 "ImportPage.c"
+#line 3648 "ImportPage.c"
 	}
 #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp3_;
 #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3650 "ImportPage.c"
+#line 3654 "ImportPage.c"
 }
 
 
@@ -3662,7 +3666,7 @@ PhotoFileFormat photo_import_source_get_file_format (PhotoImportSource* self) {
 	result = _tmp0_;
 #line 241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3665 "ImportPage.c"
+#line 3669 "ImportPage.c"
 }
 
 
@@ -3680,7 +3684,7 @@ gchar* photo_import_source_get_preview_md5 (PhotoImportSource* self) {
 	result = _tmp1_;
 #line 245 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3683 "ImportPage.c"
+#line 3687 "ImportPage.c"
 }
 
 
@@ -3699,7 +3703,7 @@ void photo_import_source_set_associated (PhotoImportSource* self, PhotoImportSou
 	_g_object_unref0 (self->priv->associated);
 #line 249 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->associated = _tmp1_;
-#line 3702 "ImportPage.c"
+#line 3706 "ImportPage.c"
 }
 
 
@@ -3717,7 +3721,7 @@ PhotoImportSource* photo_import_source_get_associated (PhotoImportSource* self)
 	result = _tmp1_;
 #line 253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3720 "ImportPage.c"
+#line 3724 "ImportPage.c"
 }
 
 
@@ -3726,7 +3730,7 @@ static gboolean photo_import_source_real_internal_delete_backing (DataSource* ba
 	gboolean result = FALSE;
 	gboolean ret = FALSE;
 	gboolean _tmp0_ = FALSE;
-	PhotoImportSource* _tmp1_ = NULL;
+	PhotoImportSource* _tmp2_ = NULL;
 	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);
@@ -3736,46 +3740,50 @@ static gboolean photo_import_source_real_internal_delete_backing (DataSource* ba
 	ret = _tmp0_;
 #line 257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 3743 "ImportPage.c"
+		gboolean _tmp1_ = FALSE;
 #line 257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_propagate_error (error, _inner_error_);
 #line 257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		return FALSE;
-#line 3743 "ImportPage.c"
+		return _tmp1_;
+#line 3749 "ImportPage.c"
 	}
 #line 258 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp1_ = self->priv->associated;
+	_tmp2_ = self->priv->associated;
 #line 258 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp1_ != NULL) {
-#line 3749 "ImportPage.c"
-		gboolean _tmp2_ = FALSE;
-		PhotoImportSource* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
+	if (_tmp2_ != NULL) {
+#line 3755 "ImportPage.c"
+		gboolean _tmp3_ = FALSE;
+		PhotoImportSource* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
+		gboolean _tmp7_ = FALSE;
 #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp3_ = self->priv->associated;
+		_tmp4_ = self->priv->associated;
 #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp4_ = data_source_internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource), &_inner_error_);
+		_tmp5_ = data_source_internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), &_inner_error_);
 #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp2_ = _tmp4_;
+		_tmp3_ = _tmp5_;
 #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 3768 "ImportPage.c"
+			gboolean _tmp6_ = FALSE;
 #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			g_propagate_error (error, _inner_error_);
 #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			return FALSE;
-#line 3766 "ImportPage.c"
+			return _tmp6_;
+#line 3774 "ImportPage.c"
 		}
 #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp5_ = ret;
+		_tmp7_ = ret;
 #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		ret = _tmp5_ & _tmp2_;
-#line 3772 "ImportPage.c"
+		ret = _tmp7_ & _tmp3_;
+#line 3780 "ImportPage.c"
 	}
 #line 260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = ret;
 #line 260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3778 "ImportPage.c"
+#line 3786 "ImportPage.c"
 }
 
 
@@ -3785,26 +3793,26 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 3807 "ImportPage.c"
+#line 3815 "ImportPage.c"
 }
 
 
@@ -3819,7 +3827,7 @@ static void photo_import_source_instance_init (PhotoImportSource * self) {
 	self->priv->exif_md5 = NULL;
 #line 159 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->associated = NULL;
-#line 3822 "ImportPage.c"
+#line 3830 "ImportPage.c"
 }
 
 
@@ -3837,7 +3845,7 @@ static void photo_import_source_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->associated);
 #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (photo_import_source_parent_class)->finalize (obj);
-#line 3840 "ImportPage.c"
+#line 3848 "ImportPage.c"
 }
 
 
@@ -3897,11 +3905,11 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_VIDEO_IMPORT_SOURCE)) {
 #line 278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		media_source_item_set_enable_sprockets (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TRUE);
-#line 3900 "ImportPage.c"
+#line 3908 "ImportPage.c"
 	}
 #line 281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	pixbuf = NULL;
-#line 3904 "ImportPage.c"
+#line 3912 "ImportPage.c"
 	{
 		GdkPixbuf* _tmp6_ = NULL;
 		ImportSource* _tmp7_ = NULL;
@@ -3915,7 +3923,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_tmp6_ = _tmp8_;
 #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3918 "ImportPage.c"
+#line 3926 "ImportPage.c"
 			goto __catch64_g_error;
 		}
 #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3928,7 +3936,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		pixbuf = _tmp9_;
 #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 3931 "ImportPage.c"
+#line 3939 "ImportPage.c"
 	}
 	goto __finally64;
 	__catch64_g_error:
@@ -3956,7 +3964,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_g_free0 (_tmp11_);
 #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_error_free0 (err);
-#line 3959 "ImportPage.c"
+#line 3967 "ImportPage.c"
 	}
 	__finally64:
 #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3969,7 +3977,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		g_clear_error (&_inner_error_);
 #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return NULL;
-#line 3972 "ImportPage.c"
+#line 3980 "ImportPage.c"
 	}
 #line 289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp14_ = pixbuf;
@@ -3979,7 +3987,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 	_tmp15_ = pixbuf;
 #line 290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp15_ == NULL) {
-#line 3982 "ImportPage.c"
+#line 3990 "ImportPage.c"
 		GdkPixbuf* _tmp16_ = NULL;
 		GdkPixbuf* _tmp20_ = NULL;
 		GdkPixbuf* _tmp21_ = NULL;
@@ -3987,7 +3995,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_tmp16_ = import_preview_placeholder_preview;
 #line 291 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp16_ == NULL) {
-#line 3990 "ImportPage.c"
+#line 3998 "ImportPage.c"
 			GdkPixbuf* _tmp17_ = NULL;
 			GdkPixbuf* _tmp18_ = NULL;
 			GdkPixbuf* _tmp19_ = NULL;
@@ -4005,7 +4013,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 			_g_object_unref0 (import_preview_placeholder_preview);
 #line 293 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			import_preview_placeholder_preview = _tmp19_;
-#line 4008 "ImportPage.c"
+#line 4016 "ImportPage.c"
 		}
 #line 297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp20_ = import_preview_placeholder_preview;
@@ -4015,7 +4023,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_g_object_unref0 (pixbuf);
 #line 297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		pixbuf = _tmp21_;
-#line 4018 "ImportPage.c"
+#line 4026 "ImportPage.c"
 	}
 #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp23_ = pixbuf;
@@ -4025,7 +4033,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 	if (_tmp24_ > IMPORT_PREVIEW_MAX_SCALE) {
 #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp22_ = TRUE;
-#line 4028 "ImportPage.c"
+#line 4036 "ImportPage.c"
 	} else {
 		GdkPixbuf* _tmp25_ = NULL;
 		gint _tmp26_ = 0;
@@ -4035,11 +4043,11 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_tmp26_ = gdk_pixbuf_get_height (_tmp25_);
 #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp22_ = _tmp26_ > IMPORT_PREVIEW_MAX_SCALE;
-#line 4038 "ImportPage.c"
+#line 4046 "ImportPage.c"
 	}
 #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp22_) {
-#line 4042 "ImportPage.c"
+#line 4050 "ImportPage.c"
 		GdkPixbuf* _tmp27_ = NULL;
 		GdkPixbuf* _tmp28_ = NULL;
 #line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4050,13 +4058,13 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_g_object_unref0 (pixbuf);
 #line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		pixbuf = _tmp28_;
-#line 4053 "ImportPage.c"
+#line 4061 "ImportPage.c"
 	}
 #line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp29_ = source;
 #line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 4059 "ImportPage.c"
+#line 4067 "ImportPage.c"
 		PhotoImportSource* photo_import_source = NULL;
 		ImportSource* _tmp30_ = NULL;
 		PhotoImportSource* _tmp31_ = NULL;
@@ -4076,7 +4084,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_tmp33_ = using_placeholder;
 #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (!_tmp33_) {
-#line 4079 "ImportPage.c"
+#line 4087 "ImportPage.c"
 			PhotoImportSource* _tmp34_ = NULL;
 			PhotoMetadata* _tmp35_ = NULL;
 			PhotoMetadata* _tmp36_ = NULL;
@@ -4090,15 +4098,15 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 			_tmp32_ = _tmp36_ != NULL;
 #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_media_metadata_unref0 (_tmp36_);
-#line 4093 "ImportPage.c"
+#line 4101 "ImportPage.c"
 		} else {
 #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp32_ = FALSE;
-#line 4097 "ImportPage.c"
+#line 4105 "ImportPage.c"
 		}
 #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp32_) {
-#line 4101 "ImportPage.c"
+#line 4109 "ImportPage.c"
 			PhotoImportSource* _tmp37_ = NULL;
 			PhotoMetadata* _tmp38_ = NULL;
 			PhotoMetadata* _tmp39_ = NULL;
@@ -4123,7 +4131,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 			pixbuf = _tmp42_;
 #line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_media_metadata_unref0 (_tmp39_);
-#line 4126 "ImportPage.c"
+#line 4134 "ImportPage.c"
 		}
 #line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp43_ = photo_import_source;
@@ -4137,7 +4145,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_g_object_unref0 (_tmp45_);
 #line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp46_) {
-#line 4140 "ImportPage.c"
+#line 4148 "ImportPage.c"
 			const gchar* _tmp47_ = NULL;
 			gchar* _tmp48_ = NULL;
 			gchar* _tmp49_ = NULL;
@@ -4151,11 +4159,11 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 			checkerboard_item_set_subtitle (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp49_, TRUE, PANGO_ALIGN_LEFT);
 #line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp49_);
-#line 4154 "ImportPage.c"
+#line 4162 "ImportPage.c"
 		}
 #line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (photo_import_source);
-#line 4158 "ImportPage.c"
+#line 4166 "ImportPage.c"
 	}
 #line 315 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp50_ = pixbuf;
@@ -4165,14 +4173,14 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 	_g_object_unref0 (pixbuf);
 #line 271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 4168 "ImportPage.c"
+#line 4176 "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 4175 "ImportPage.c"
+#line 4183 "ImportPage.c"
 }
 
 
@@ -4196,7 +4204,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 4199 "ImportPage.c"
+#line 4207 "ImportPage.c"
 	}
 #line 319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	photo_import_source = _tmp1_;
@@ -4204,7 +4212,7 @@ 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 4207 "ImportPage.c"
+#line 4215 "ImportPage.c"
 		gchar* preview_md5 = NULL;
 		PhotoImportSource* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
@@ -4233,7 +4241,7 @@ 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 4236 "ImportPage.c"
+#line 4244 "ImportPage.c"
 			const gchar* _tmp10_ = NULL;
 			PhotoFileFormat _tmp11_ = 0;
 			gboolean _tmp12_ = FALSE;
@@ -4245,15 +4253,15 @@ 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 4248 "ImportPage.c"
+#line 4256 "ImportPage.c"
 		} else {
 #line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp7_ = FALSE;
-#line 4252 "ImportPage.c"
+#line 4260 "ImportPage.c"
 		}
 #line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp7_) {
-#line 4256 "ImportPage.c"
+#line 4264 "ImportPage.c"
 			const gchar* _tmp13_ = NULL;
 			PhotoFileFormat _tmp14_ = 0;
 			PhotoID _tmp15_ = {0};
@@ -4278,13 +4286,13 @@ 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 4281 "ImportPage.c"
+#line 4289 "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 4287 "ImportPage.c"
+#line 4295 "ImportPage.c"
 			guint64 filesize = 0ULL;
 			ImportSource* _tmp18_ = NULL;
 			ImportSource* _tmp19_ = NULL;
@@ -4307,7 +4315,7 @@ 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 4310 "ImportPage.c"
+#line 4318 "ImportPage.c"
 				PhotoID duplicated_photo_id = {0};
 				LibraryPhotoSourceCollection* _tmp23_ = NULL;
 				ImportSource* _tmp24_ = NULL;
@@ -4344,7 +4352,7 @@ 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 4347 "ImportPage.c"
+#line 4355 "ImportPage.c"
 					LibraryPhoto* duplicated_photo = NULL;
 					LibraryPhotoSourceCollection* _tmp32_ = NULL;
 					PhotoID _tmp33_ = {0};
@@ -4383,7 +4391,7 @@ 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 4386 "ImportPage.c"
+#line 4394 "ImportPage.c"
 						LibraryPhotoSourceCollection* _tmp41_ = NULL;
 						ImportSource* _tmp42_ = NULL;
 						ImportSource* _tmp43_ = NULL;
@@ -4426,11 +4434,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 4429 "ImportPage.c"
+#line 4437 "ImportPage.c"
 					}
 #line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (duplicated_photo);
-#line 4433 "ImportPage.c"
+#line 4441 "ImportPage.c"
 				}
 			}
 		}
@@ -4442,7 +4450,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 4445 "ImportPage.c"
+#line 4453 "ImportPage.c"
 	}
 #line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp49_ = import_preview_get_import_source (self);
@@ -4452,7 +4460,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 4455 "ImportPage.c"
+#line 4463 "ImportPage.c"
 	}
 #line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	video_import_source = _tmp50_;
@@ -4460,7 +4468,7 @@ 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 4463 "ImportPage.c"
+#line 4471 "ImportPage.c"
 		VideoSourceCollection* _tmp52_ = NULL;
 		VideoImportSource* _tmp53_ = NULL;
 		gchar* _tmp54_ = NULL;
@@ -4489,7 +4497,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 		_g_free0 (_tmp55_);
 #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp59_) {
-#line 4492 "ImportPage.c"
+#line 4500 "ImportPage.c"
 			VideoSourceCollection* _tmp60_ = NULL;
 			VideoImportSource* _tmp61_ = NULL;
 			gchar* _tmp62_ = NULL;
@@ -4528,7 +4536,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 4531 "ImportPage.c"
+#line 4539 "ImportPage.c"
 		}
 #line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
@@ -4538,7 +4546,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 4541 "ImportPage.c"
+#line 4549 "ImportPage.c"
 	}
 #line 384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = FALSE;
@@ -4548,7 +4556,7 @@ 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 4551 "ImportPage.c"
+#line 4559 "ImportPage.c"
 }
 
 
@@ -4567,7 +4575,7 @@ DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self) {
 		result = NULL;
 #line 389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 4570 "ImportPage.c"
+#line 4578 "ImportPage.c"
 	}
 #line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->duplicated_file;
@@ -4577,7 +4585,7 @@ DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self) {
 	result = _tmp2_;
 #line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4580 "ImportPage.c"
+#line 4588 "ImportPage.c"
 }
 
 
@@ -4592,7 +4600,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 4595 "ImportPage.c"
+#line 4603 "ImportPage.c"
 }
 
 
@@ -4603,14 +4611,14 @@ 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 4606 "ImportPage.c"
+#line 4614 "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 4613 "ImportPage.c"
+#line 4621 "ImportPage.c"
 }
 
 
@@ -4622,7 +4630,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 4625 "ImportPage.c"
+#line 4633 "ImportPage.c"
 }
 
 
@@ -4660,14 +4668,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 4663 "ImportPage.c"
+#line 4671 "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 4670 "ImportPage.c"
+#line 4678 "ImportPage.c"
 }
 
 
@@ -4676,7 +4684,7 @@ 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 4679 "ImportPage.c"
+#line 4687 "ImportPage.c"
 }
 
 
@@ -4696,7 +4704,7 @@ 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 4699 "ImportPage.c"
+#line 4707 "ImportPage.c"
 }
 
 
@@ -4712,7 +4720,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 4715 "ImportPage.c"
+#line 4723 "ImportPage.c"
 }
 
 
@@ -4764,7 +4772,7 @@ 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 4767 "ImportPage.c"
+#line 4775 "ImportPage.c"
 		PhotoImportSource* _tmp7_ = NULL;
 		PhotoFileFormat _tmp8_ = 0;
 #line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4773,21 +4781,21 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
 		_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 4776 "ImportPage.c"
+#line 4784 "ImportPage.c"
 	} else {
 #line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = FALSE;
-#line 4780 "ImportPage.c"
+#line 4788 "ImportPage.c"
 	}
 #line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_) {
-#line 4784 "ImportPage.c"
+#line 4792 "ImportPage.c"
 		gint _tmp9_ = 0;
 #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 4790 "ImportPage.c"
+#line 4798 "ImportPage.c"
 	} else {
 		gboolean _tmp10_ = FALSE;
 		PhotoImportSource* _tmp11_ = NULL;
@@ -4795,7 +4803,7 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
 		_tmp11_ = photo;
 #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp11_ != NULL) {
-#line 4798 "ImportPage.c"
+#line 4806 "ImportPage.c"
 			PhotoImportSource* _tmp12_ = NULL;
 			PhotoFileFormat _tmp13_ = 0;
 #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4804,34 +4812,34 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
 			_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 4807 "ImportPage.c"
+#line 4815 "ImportPage.c"
 		} else {
 #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp10_ = FALSE;
-#line 4811 "ImportPage.c"
+#line 4819 "ImportPage.c"
 		}
 #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp10_) {
-#line 4815 "ImportPage.c"
+#line 4823 "ImportPage.c"
 			gint _tmp14_ = 0;
 #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 4821 "ImportPage.c"
+#line 4829 "ImportPage.c"
 		} else {
 			ImportSource* _tmp15_ = NULL;
 #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 4828 "ImportPage.c"
+#line 4836 "ImportPage.c"
 				gint _tmp16_ = 0;
 #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 4834 "ImportPage.c"
+#line 4842 "ImportPage.c"
 			}
 		}
 	}
@@ -4843,7 +4851,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 4846 "ImportPage.c"
+#line 4854 "ImportPage.c"
 }
 
 
@@ -4883,7 +4891,7 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 	_tmp6_ = photo;
 #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp6_ != NULL) {
-#line 4886 "ImportPage.c"
+#line 4894 "ImportPage.c"
 		PhotoImportSource* _tmp7_ = NULL;
 		PhotoFileFormat _tmp8_ = 0;
 #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4892,15 +4900,15 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 		_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 4895 "ImportPage.c"
+#line 4903 "ImportPage.c"
 	} else {
 #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = FALSE;
-#line 4899 "ImportPage.c"
+#line 4907 "ImportPage.c"
 	}
 #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_) {
-#line 4903 "ImportPage.c"
+#line 4911 "ImportPage.c"
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
 #line 441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4911,7 +4919,7 @@ 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 4914 "ImportPage.c"
+#line 4922 "ImportPage.c"
 	} else {
 		gboolean _tmp11_ = FALSE;
 		PhotoImportSource* _tmp12_ = NULL;
@@ -4919,7 +4927,7 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 		_tmp12_ = photo;
 #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp12_ != NULL) {
-#line 4922 "ImportPage.c"
+#line 4930 "ImportPage.c"
 			PhotoImportSource* _tmp13_ = NULL;
 			PhotoFileFormat _tmp14_ = 0;
 #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4928,15 +4936,15 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 			_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 4931 "ImportPage.c"
+#line 4939 "ImportPage.c"
 		} else {
 #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = FALSE;
-#line 4935 "ImportPage.c"
+#line 4943 "ImportPage.c"
 		}
 #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp11_) {
-#line 4939 "ImportPage.c"
+#line 4947 "ImportPage.c"
 			gint _tmp15_ = 0;
 			gint _tmp16_ = 0;
 #line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4947,14 +4955,14 @@ 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 4950 "ImportPage.c"
+#line 4958 "ImportPage.c"
 		} else {
 			ImportSource* _tmp17_ = NULL;
 #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 4957 "ImportPage.c"
+#line 4965 "ImportPage.c"
 				gint _tmp18_ = 0;
 				gint _tmp19_ = 0;
 #line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4965,7 +4973,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 4968 "ImportPage.c"
+#line 4976 "ImportPage.c"
 			}
 		}
 	}
@@ -4977,7 +4985,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 4980 "ImportPage.c"
+#line 4988 "ImportPage.c"
 }
 
 
@@ -4994,7 +5002,7 @@ static gboolean camera_accumulator_real_altered (CoreTrackerAccumulator* base, D
 	result = FALSE;
 #line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4997 "ImportPage.c"
+#line 5005 "ImportPage.c"
 }
 
 
@@ -5021,7 +5029,7 @@ gchar* camera_accumulator_to_string (CameraAccumulator* self) {
 	result = _tmp4_;
 #line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5024 "ImportPage.c"
+#line 5032 "ImportPage.c"
 }
 
 
@@ -5031,14 +5039,14 @@ 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 5034 "ImportPage.c"
+#line 5042 "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 5041 "ImportPage.c"
+#line 5049 "ImportPage.c"
 }
 
 
@@ -5053,7 +5061,7 @@ gint camera_accumulator_get_total (CameraAccumulator* self) {
 	result = _tmp0_;
 #line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5056 "ImportPage.c"
+#line 5064 "ImportPage.c"
 }
 
 
@@ -5067,7 +5075,7 @@ static void camera_accumulator_set_total (CameraAccumulator* self, gint value) {
 	self->priv->_total = _tmp0_;
 #line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_notify ((GObject *) self, "total");
-#line 5070 "ImportPage.c"
+#line 5078 "ImportPage.c"
 }
 
 
@@ -5082,7 +5090,7 @@ gint camera_accumulator_get_photos (CameraAccumulator* self) {
 	result = _tmp0_;
 #line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5085 "ImportPage.c"
+#line 5093 "ImportPage.c"
 }
 
 
@@ -5096,7 +5104,7 @@ static void camera_accumulator_set_photos (CameraAccumulator* self, gint value)
 	self->priv->_photos = _tmp0_;
 #line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_notify ((GObject *) self, "photos");
-#line 5099 "ImportPage.c"
+#line 5107 "ImportPage.c"
 }
 
 
@@ -5111,7 +5119,7 @@ gint camera_accumulator_get_videos (CameraAccumulator* self) {
 	result = _tmp0_;
 #line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5114 "ImportPage.c"
+#line 5122 "ImportPage.c"
 }
 
 
@@ -5125,7 +5133,7 @@ static void camera_accumulator_set_videos (CameraAccumulator* self, gint value)
 	self->priv->_videos = _tmp0_;
 #line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_notify ((GObject *) self, "videos");
-#line 5128 "ImportPage.c"
+#line 5136 "ImportPage.c"
 }
 
 
@@ -5140,7 +5148,7 @@ gint camera_accumulator_get_raw (CameraAccumulator* self) {
 	result = _tmp0_;
 #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5143 "ImportPage.c"
+#line 5151 "ImportPage.c"
 }
 
 
@@ -5154,7 +5162,7 @@ static void camera_accumulator_set_raw (CameraAccumulator* self, gint value) {
 	self->priv->_raw = _tmp0_;
 #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_notify ((GObject *) self, "raw");
-#line 5157 "ImportPage.c"
+#line 5165 "ImportPage.c"
 }
 
 
@@ -5177,7 +5185,7 @@ static void camera_accumulator_class_init (CameraAccumulatorClass * klass) {
 	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));
 #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 5180 "ImportPage.c"
+#line 5188 "ImportPage.c"
 }
 
 
@@ -5190,7 +5198,7 @@ static void camera_accumulator_core_tracker_accumulator_interface_init (CoreTrac
 	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 5193 "ImportPage.c"
+#line 5201 "ImportPage.c"
 }
 
 
@@ -5205,7 +5213,7 @@ 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 5208 "ImportPage.c"
+#line 5216 "ImportPage.c"
 }
 
 
@@ -5215,7 +5223,7 @@ static void camera_accumulator_finalize (GObject* obj) {
 	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 5218 "ImportPage.c"
+#line 5226 "ImportPage.c"
 }
 
 
@@ -5262,13 +5270,13 @@ static void _vala_camera_accumulator_get_property (GObject * object, guint prope
 		g_value_set_int (value, camera_accumulator_get_raw (self));
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 5265 "ImportPage.c"
+#line 5273 "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 5271 "ImportPage.c"
+#line 5279 "ImportPage.c"
 	}
 }
 
@@ -5302,13 +5310,13 @@ static void _vala_camera_accumulator_set_property (GObject * object, guint prope
 		camera_accumulator_set_raw (self, g_value_get_int (value));
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 5305 "ImportPage.c"
+#line 5313 "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 5311 "ImportPage.c"
+#line 5319 "ImportPage.c"
 	}
 }
 
@@ -5316,7 +5324,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 5319 "ImportPage.c"
+#line 5327 "ImportPage.c"
 }
 
 
@@ -5335,28 +5343,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 5338 "ImportPage.c"
+#line 5346 "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 5345 "ImportPage.c"
+#line 5353 "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 5352 "ImportPage.c"
+#line 5360 "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 5359 "ImportPage.c"
+#line 5367 "ImportPage.c"
 }
 
 
@@ -5365,7 +5373,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 5368 "ImportPage.c"
+#line 5376 "ImportPage.c"
 }
 
 
@@ -5374,28 +5382,28 @@ 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 5377 "ImportPage.c"
+#line 5385 "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 5384 "ImportPage.c"
+#line 5392 "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 5391 "ImportPage.c"
+#line 5399 "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 5398 "ImportPage.c"
+#line 5406 "ImportPage.c"
 }
 
 
@@ -5504,7 +5512,7 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
 	_tmp14_ = display_name;
 #line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (NULL != _tmp14_) {
-#line 5507 "ImportPage.c"
+#line 5515 "ImportPage.c"
 		const gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
 #line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5515,7 +5523,7 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
 		_g_free0 (self->priv->camera_name);
 #line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		self->priv->camera_name = _tmp16_;
-#line 5518 "ImportPage.c"
+#line 5526 "ImportPage.c"
 	} else {
 		CameraAbilities abilities = {0};
 		int res = 0;
@@ -5537,7 +5545,7 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
 		_tmp20_ = res;
 #line 732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp20_ != GP_OK) {
-#line 5540 "ImportPage.c"
+#line 5548 "ImportPage.c"
 			int _tmp21_ = 0;
 			gchar* _tmp22_ = NULL;
 			gchar* _tmp23_ = NULL;
@@ -5561,11 +5569,11 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
 			_g_free0 (self->priv->camera_name);
 #line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			self->priv->camera_name = _tmp25_;
-#line 5564 "ImportPage.c"
+#line 5572 "ImportPage.c"
 		}
 #line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		 (abilities);
-#line 5568 "ImportPage.c"
+#line 5576 "ImportPage.c"
 	}
 #line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp26_ = self->priv->camera_label;
@@ -5587,7 +5595,7 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
 	_tmp30_ = import_page_null_context;
 #line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp30_ == NULL) {
-#line 5590 "ImportPage.c"
+#line 5598 "ImportPage.c"
 		GPContextWrapper* _tmp31_ = NULL;
 #line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp31_ = gp_context_wrapper_new ();
@@ -5595,13 +5603,13 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
 		_gp_context_wrapper_unref0 (import_page_null_context);
 #line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_null_context = _tmp31_;
-#line 5598 "ImportPage.c"
+#line 5606 "ImportPage.c"
 	}
 #line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp32_ = import_page_spin_idle_context;
 #line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp32_ == NULL) {
-#line 5604 "ImportPage.c"
+#line 5612 "ImportPage.c"
 		GPSpinIdleWrapper* _tmp33_ = NULL;
 #line 749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp33_ = gp_spin_idle_wrapper_new ();
@@ -5609,7 +5617,7 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
 		_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 5612 "ImportPage.c"
+#line 5620 "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));
@@ -5691,21 +5699,21 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
 	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 5694 "ImportPage.c"
+#line 5702 "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 5701 "ImportPage.c"
+#line 5709 "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 5708 "ImportPage.c"
+#line 5716 "ImportPage.c"
 }
 
 
@@ -5721,7 +5729,7 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) {
 	_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 5724 "ImportPage.c"
+#line 5732 "ImportPage.c"
 		GtkToolbar* _tmp1_ = NULL;
 		GtkToolbar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
@@ -6020,7 +6028,7 @@ 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 6023 "ImportPage.c"
+#line 6031 "ImportPage.c"
 	}
 #line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp59_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
@@ -6030,14 +6038,14 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) {
 	result = _tmp60_;
 #line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6033 "ImportPage.c"
+#line 6041 "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 6040 "ImportPage.c"
+#line 6048 "ImportPage.c"
 }
 
 
@@ -6056,7 +6064,7 @@ 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 6059 "ImportPage.c"
+#line 6067 "ImportPage.c"
 }
 
 
@@ -6075,7 +6083,7 @@ static gchar* import_page_real_get_view_empty_message (CheckerboardPage* base) {
 	result = _tmp1_;
 #line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6078 "ImportPage.c"
+#line 6086 "ImportPage.c"
 }
 
 
@@ -6094,7 +6102,7 @@ static gchar* import_page_real_get_filter_no_match_message (CheckerboardPage* ba
 	result = _tmp1_;
 #line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6097 "ImportPage.c"
+#line 6105 "ImportPage.c"
 }
 
 
@@ -6135,7 +6143,7 @@ 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 6138 "ImportPage.c"
+#line 6146 "ImportPage.c"
 }
 
 
@@ -6155,7 +6163,7 @@ 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 6158 "ImportPage.c"
+#line 6166 "ImportPage.c"
 }
 
 
@@ -6179,7 +6187,7 @@ 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 6182 "ImportPage.c"
+#line 6190 "ImportPage.c"
 }
 
 
@@ -6199,14 +6207,14 @@ 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 6202 "ImportPage.c"
+#line 6210 "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 6209 "ImportPage.c"
+#line 6217 "ImportPage.c"
 }
 
 
@@ -6252,7 +6260,7 @@ 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 6255 "ImportPage.c"
+#line 6263 "ImportPage.c"
 }
 
 
@@ -6267,7 +6275,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 6270 "ImportPage.c"
+#line 6278 "ImportPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -6279,11 +6287,11 @@ 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 6282 "ImportPage.c"
+#line 6290 "ImportPage.c"
 			GActionEntry entry = {0};
 #line 900 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			entry = entry_collection[entry_it];
-#line 6286 "ImportPage.c"
+#line 6294 "ImportPage.c"
 			{
 				GActionMap* _tmp1_ = NULL;
 				GActionEntry _tmp2_ = {0};
@@ -6296,7 +6304,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 6299 "ImportPage.c"
+#line 6307 "ImportPage.c"
 			}
 		}
 	}
@@ -6317,7 +6325,7 @@ Camera* import_page_get_camera (ImportPage* self) {
 	result = _tmp1_;
 #line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6320 "ImportPage.c"
+#line 6328 "ImportPage.c"
 }
 
 
@@ -6335,7 +6343,7 @@ gchar* import_page_get_uri (ImportPage* self) {
 	result = _tmp1_;
 #line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6338 "ImportPage.c"
+#line 6346 "ImportPage.c"
 }
 
 
@@ -6350,7 +6358,7 @@ gboolean import_page_is_busy (ImportPage* self) {
 	result = _tmp0_;
 #line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6353 "ImportPage.c"
+#line 6361 "ImportPage.c"
 }
 
 
@@ -6372,7 +6380,7 @@ 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 6375 "ImportPage.c"
+#line 6383 "ImportPage.c"
 }
 
 
@@ -6386,23 +6394,23 @@ gboolean import_page_is_refreshed (ImportPage* self) {
 	_tmp1_ = self->priv->refreshed;
 #line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_) {
-#line 6389 "ImportPage.c"
+#line 6397 "ImportPage.c"
 		gboolean _tmp2_ = FALSE;
 #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 6395 "ImportPage.c"
+#line 6403 "ImportPage.c"
 	} else {
 #line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = FALSE;
-#line 6399 "ImportPage.c"
+#line 6407 "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 6405 "ImportPage.c"
+#line 6413 "ImportPage.c"
 }
 
 
@@ -6418,7 +6426,7 @@ 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 6421 "ImportPage.c"
+#line 6429 "ImportPage.c"
 		const gchar* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 #line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6429,14 +6437,14 @@ gchar* import_page_get_refresh_message (ImportPage* self) {
 		_g_free0 (msg);
 #line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		msg = _tmp2_;
-#line 6432 "ImportPage.c"
+#line 6440 "ImportPage.c"
 	} else {
 		int _tmp3_ = 0;
 #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 6439 "ImportPage.c"
+#line 6447 "ImportPage.c"
 		} else {
 			int _tmp4_ = 0;
 			gchar* _tmp5_ = NULL;
@@ -6448,14 +6456,14 @@ gchar* import_page_get_refresh_message (ImportPage* self) {
 			_g_free0 (msg);
 #line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			msg = _tmp5_;
-#line 6451 "ImportPage.c"
+#line 6459 "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 6458 "ImportPage.c"
+#line 6466 "ImportPage.c"
 }
 
 
@@ -6474,7 +6482,7 @@ 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 6477 "ImportPage.c"
+#line 6485 "ImportPage.c"
 }
 
 
@@ -6486,7 +6494,7 @@ static void import_page_update_toolbar_state (ImportPage* self) {
 	_tmp0_ = self->priv->hide_imported;
 #line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ != NULL) {
-#line 6489 "ImportPage.c"
+#line 6497 "ImportPage.c"
 		gboolean _tmp1_ = FALSE;
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_ = FALSE;
@@ -6495,21 +6503,21 @@ static void import_page_update_toolbar_state (ImportPage* self) {
 		_tmp3_ = self->priv->busy;
 #line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (!_tmp3_) {
-#line 6498 "ImportPage.c"
+#line 6506 "ImportPage.c"
 			gboolean _tmp4_ = FALSE;
 #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 6504 "ImportPage.c"
+#line 6512 "ImportPage.c"
 		} else {
 #line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp2_ = FALSE;
-#line 6508 "ImportPage.c"
+#line 6516 "ImportPage.c"
 		}
 #line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp2_) {
-#line 6512 "ImportPage.c"
+#line 6520 "ImportPage.c"
 			ViewCollection* _tmp5_ = NULL;
 			ViewCollection* _tmp6_ = NULL;
 			gint _tmp7_ = 0;
@@ -6523,17 +6531,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 6526 "ImportPage.c"
+#line 6534 "ImportPage.c"
 		} else {
 #line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp1_ = FALSE;
-#line 6530 "ImportPage.c"
+#line 6538 "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 6536 "ImportPage.c"
+#line 6544 "ImportPage.c"
 	}
 }
 
@@ -6553,21 +6561,21 @@ static void import_page_on_view_changed (ImportPage* self) {
 	_tmp2_ = self->priv->busy;
 #line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp2_) {
-#line 6556 "ImportPage.c"
+#line 6564 "ImportPage.c"
 		gboolean _tmp3_ = FALSE;
 #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 6562 "ImportPage.c"
+#line 6570 "ImportPage.c"
 	} else {
 #line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = FALSE;
-#line 6566 "ImportPage.c"
+#line 6574 "ImportPage.c"
 	}
 #line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_) {
-#line 6570 "ImportPage.c"
+#line 6578 "ImportPage.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
@@ -6581,11 +6589,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 6584 "ImportPage.c"
+#line 6592 "ImportPage.c"
 	} else {
 #line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = FALSE;
-#line 6588 "ImportPage.c"
+#line 6596 "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_);
@@ -6593,21 +6601,21 @@ 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 6596 "ImportPage.c"
+#line 6604 "ImportPage.c"
 		gboolean _tmp10_ = FALSE;
 #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 6602 "ImportPage.c"
+#line 6610 "ImportPage.c"
 	} else {
 #line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = FALSE;
-#line 6606 "ImportPage.c"
+#line 6614 "ImportPage.c"
 	}
 #line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp8_) {
-#line 6610 "ImportPage.c"
+#line 6618 "ImportPage.c"
 		ViewCollection* _tmp11_ = NULL;
 		ViewCollection* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
@@ -6621,11 +6629,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 6624 "ImportPage.c"
+#line 6632 "ImportPage.c"
 	} else {
 #line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = FALSE;
-#line 6628 "ImportPage.c"
+#line 6636 "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_);
@@ -6633,7 +6641,7 @@ 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 6636 "ImportPage.c"
+#line 6644 "ImportPage.c"
 		ViewCollection* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
 		gint _tmp18_ = 0;
@@ -6647,17 +6655,17 @@ 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 6650 "ImportPage.c"
+#line 6658 "ImportPage.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = FALSE;
-#line 6654 "ImportPage.c"
+#line 6662 "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 6660 "ImportPage.c"
+#line 6668 "ImportPage.c"
 }
 
 
@@ -6669,7 +6677,7 @@ static void import_page_on_media_added_removed (ImportPage* self) {
 	_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 6672 "ImportPage.c"
+#line 6680 "ImportPage.c"
 }
 
 
@@ -6707,7 +6715,7 @@ 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 6710 "ImportPage.c"
+#line 6718 "ImportPage.c"
 }
 
 
@@ -6730,7 +6738,7 @@ 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 6733 "ImportPage.c"
+#line 6741 "ImportPage.c"
 }
 
 
@@ -6745,7 +6753,7 @@ 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 6748 "ImportPage.c"
+#line 6756 "ImportPage.c"
 }
 
 
@@ -6764,20 +6772,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 6767 "ImportPage.c"
+#line 6775 "ImportPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
 #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 6774 "ImportPage.c"
+#line 6782 "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 6780 "ImportPage.c"
+#line 6788 "ImportPage.c"
 	}
 #line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = import_page_refresh_camera (self);
@@ -6791,15 +6799,15 @@ 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 6794 "ImportPage.c"
+#line 6802 "ImportPage.c"
 		{
 #line 998 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 6798 "ImportPage.c"
+#line 6806 "ImportPage.c"
 		}
 #line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case IMPORT_PAGE_REFRESH_RESULT_LOCKED:
-#line 6802 "ImportPage.c"
+#line 6810 "ImportPage.c"
 		{
 			gboolean _tmp5_ = FALSE;
 			const gchar* _tmp6_ = NULL;
@@ -6816,7 +6824,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 6819 "ImportPage.c"
+#line 6827 "ImportPage.c"
 			}
 #line 1008 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp6_ = self->priv->uri;
@@ -6830,7 +6838,7 @@ 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 6833 "ImportPage.c"
+#line 6841 "ImportPage.c"
 			{
 				GMount* _tmp9_ = NULL;
 				GFile* _tmp10_ = NULL;
@@ -6844,7 +6852,7 @@ 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 6847 "ImportPage.c"
+#line 6855 "ImportPage.c"
 					goto __catch65_g_error;
 				}
 #line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6857,7 +6865,7 @@ 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 6860 "ImportPage.c"
+#line 6868 "ImportPage.c"
 			}
 			goto __finally65;
 			__catch65_g_error:
@@ -6869,7 +6877,7 @@ 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 6872 "ImportPage.c"
+#line 6880 "ImportPage.c"
 			}
 			__finally65:
 #line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6884,13 +6892,13 @@ 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 6887 "ImportPage.c"
+#line 6895 "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 6893 "ImportPage.c"
+#line 6901 "ImportPage.c"
 				gchar* mounted_message = NULL;
 				const gchar* _tmp14_ = NULL;
 				gchar* _tmp15_ = NULL;
@@ -6955,26 +6963,26 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				_tmp27_ = dialog_res;
 #line 1031 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp27_ != ((gint) GTK_RESPONSE_YES)) {
-#line 6957 "ImportPage.c"
+#line 6965 "ImportPage.c"
 					const gchar* _tmp28_ = NULL;
 #line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp28_ = _ ("Please unmount the camera.");
 #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 6963 "ImportPage.c"
+#line 6971 "ImportPage.c"
 				} else {
 					GMount* _tmp29_ = NULL;
 #line 1034 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp29_ = mount;
 #line 1034 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					import_page_unmount_camera (self, _tmp29_);
-#line 6970 "ImportPage.c"
+#line 6978 "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 6976 "ImportPage.c"
+#line 6984 "ImportPage.c"
 			} else {
 				gchar* locked_message = NULL;
 				const gchar* _tmp30_ = NULL;
@@ -7033,7 +7041,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				_g_object_unref0 (dialog);
 #line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (locked_message);
-#line 7033 "ImportPage.c"
+#line 7041 "ImportPage.c"
 			}
 #line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (mount);
@@ -7041,11 +7049,11 @@ 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 7041 "ImportPage.c"
+#line 7049 "ImportPage.c"
 		}
 #line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR:
-#line 7045 "ImportPage.c"
+#line 7053 "ImportPage.c"
 		{
 			const gchar* _tmp41_ = NULL;
 			gchar* _tmp42_ = NULL;
@@ -7070,7 +7078,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 			_g_free0 (_tmp43_);
 #line 1054 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 7070 "ImportPage.c"
+#line 7078 "ImportPage.c"
 		}
 		default:
 		{
@@ -7079,7 +7087,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 			_tmp46_ = res;
 #line 1057 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			g_error ("ImportPage.vala:1057: Unknown result type %d", (gint) _tmp46_);
-#line 7079 "ImportPage.c"
+#line 7087 "ImportPage.c"
 		}
 	}
 }
@@ -7088,7 +7096,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 7088 "ImportPage.c"
+#line 7096 "ImportPage.c"
 }
 
 
@@ -7097,7 +7105,7 @@ 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 7097 "ImportPage.c"
+#line 7105 "ImportPage.c"
 }
 
 
@@ -7127,7 +7135,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 7127 "ImportPage.c"
+#line 7135 "ImportPage.c"
 	}
 #line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_status (self, TRUE, FALSE);
@@ -7175,7 +7183,7 @@ gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) {
 	result = TRUE;
 #line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 7175 "ImportPage.c"
+#line 7183 "ImportPage.c"
 }
 
 
@@ -7198,7 +7206,7 @@ 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 7198 "ImportPage.c"
+#line 7206 "ImportPage.c"
 	{
 		GAsyncResult* _tmp2_ = NULL;
 #line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7207,7 +7215,7 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
 		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 7207 "ImportPage.c"
+#line 7215 "ImportPage.c"
 			goto __catch66_g_error;
 		}
 	}
@@ -7248,7 +7256,7 @@ 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 7248 "ImportPage.c"
+#line 7256 "ImportPage.c"
 	}
 	__finally66:
 #line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7261,11 +7269,11 @@ 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 7261 "ImportPage.c"
+#line 7269 "ImportPage.c"
 	}
 #line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (mount);
-#line 7265 "ImportPage.c"
+#line 7273 "ImportPage.c"
 }
 
 
@@ -7298,7 +7306,7 @@ 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 7298 "ImportPage.c"
+#line 7306 "ImportPage.c"
 }
 
 
@@ -7323,7 +7331,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 7323 "ImportPage.c"
+#line 7331 "ImportPage.c"
 }
 
 
@@ -7395,7 +7403,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 7395 "ImportPage.c"
+#line 7403 "ImportPage.c"
 	}
 #line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = self->priv->camera;
@@ -7423,7 +7431,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 7423 "ImportPage.c"
+#line 7431 "ImportPage.c"
 	}
 #line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp15_ = folders;
@@ -7431,19 +7439,19 @@ 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 7431 "ImportPage.c"
+#line 7439 "ImportPage.c"
 	{
 		gint list_index = 0;
 #line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		list_index = 0;
-#line 7436 "ImportPage.c"
+#line 7444 "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 7443 "ImportPage.c"
+#line 7451 "ImportPage.c"
 				gint _tmp19_ = 0;
 				gint _tmp20_ = 0;
 				gchar* tmp = NULL;
@@ -7455,13 +7463,13 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
 				const gchar* _tmp26_ = NULL;
 #line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp17_) {
-#line 7455 "ImportPage.c"
+#line 7463 "ImportPage.c"
 					gint _tmp18_ = 0;
 #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 7461 "ImportPage.c"
+#line 7469 "ImportPage.c"
 				}
 #line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp17_ = FALSE;
@@ -7473,7 +7481,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 7473 "ImportPage.c"
+#line 7481 "ImportPage.c"
 				}
 #line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp21_ = folders;
@@ -7503,11 +7511,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 7503 "ImportPage.c"
+#line 7511 "ImportPage.c"
 				}
 #line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (tmp);
-#line 7507 "ImportPage.c"
+#line 7515 "ImportPage.c"
 			}
 		}
 	}
@@ -7519,7 +7527,7 @@ 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 7519 "ImportPage.c"
+#line 7527 "ImportPage.c"
 }
 
 
@@ -7574,7 +7582,7 @@ 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 7574 "ImportPage.c"
+#line 7582 "ImportPage.c"
 	}
 #line 1160 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _ ("Starting import, please wait…");
@@ -7602,7 +7610,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 	_tmp7_ = self->priv->refresh_result;
 #line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp7_ != GP_OK) {
-#line 7602 "ImportPage.c"
+#line 7610 "ImportPage.c"
 		int _tmp8_ = 0;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
@@ -7624,17 +7632,17 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 		if (_tmp12_ == GP_ERROR_IO_LOCK) {
 #line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
-#line 7624 "ImportPage.c"
+#line 7632 "ImportPage.c"
 		} else {
 #line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR;
-#line 7628 "ImportPage.c"
+#line 7636 "ImportPage.c"
 		}
 #line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = _tmp11_;
 #line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7634 "ImportPage.c"
+#line 7642 "ImportPage.c"
 	}
 #line 1172 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = self->priv->refreshed;
@@ -7665,7 +7673,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 #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);
 #line 1182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp20_ = gee_array_list_new (TYPE_IMPORT_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp20_ = 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_;
 #line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7688,19 +7696,19 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 	_tmp26_ = self->priv->refresh_result;
 #line 1187 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp26_ == GP_OK) {
-#line 7688 "ImportPage.c"
+#line 7696 "ImportPage.c"
 		{
 			gint fsid = 0;
 #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			fsid = 0;
-#line 7693 "ImportPage.c"
+#line 7701 "ImportPage.c"
 			{
 				gboolean _tmp27_ = FALSE;
 #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp27_ = TRUE;
 #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				while (TRUE) {
-#line 7700 "ImportPage.c"
+#line 7708 "ImportPage.c"
 					gint _tmp29_ = 0;
 					gint _tmp30_ = 0;
 					gboolean got_well_known_dir = FALSE;
@@ -7727,13 +7735,13 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					gboolean _tmp71_ = FALSE;
 #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!_tmp27_) {
-#line 7727 "ImportPage.c"
+#line 7735 "ImportPage.c"
 						gint _tmp28_ = 0;
 #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp28_ = fsid;
 #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						fsid = _tmp28_ + 1;
-#line 7733 "ImportPage.c"
+#line 7741 "ImportPage.c"
 					}
 #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp27_ = FALSE;
@@ -7745,7 +7753,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					if (!(_tmp29_ < _tmp30_)) {
 #line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						break;
-#line 7745 "ImportPage.c"
+#line 7753 "ImportPage.c"
 					}
 #line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					got_well_known_dir = FALSE;
@@ -7755,7 +7763,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					_tmp32_ = import_page_check_directory_exists (self, _tmp31_, "/", "DCIM");
 #line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp32_) {
-#line 7755 "ImportPage.c"
+#line 7763 "ImportPage.c"
 						gint _tmp33_ = 0;
 						GeeArrayList* _tmp34_ = NULL;
 #line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7766,7 +7774,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						import_page_enumerate_files (self, _tmp33_, "/DCIM", _tmp34_);
 #line 1197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7766 "ImportPage.c"
+#line 7774 "ImportPage.c"
 					}
 #line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp35_ = fsid;
@@ -7774,7 +7782,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					_tmp36_ = import_page_check_directory_exists (self, _tmp35_, "/", "dcim");
 #line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp36_) {
-#line 7774 "ImportPage.c"
+#line 7782 "ImportPage.c"
 						gint _tmp37_ = 0;
 						GeeArrayList* _tmp38_ = NULL;
 #line 1200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7785,7 +7793,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						import_page_enumerate_files (self, _tmp37_, "/dcim", _tmp38_);
 #line 1201 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7785 "ImportPage.c"
+#line 7793 "ImportPage.c"
 					}
 #line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp39_ = fsid;
@@ -7793,7 +7801,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					_tmp40_ = import_page_check_directory_exists (self, _tmp39_, "/PRIVATE/", "AVCHD");
 #line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp40_) {
-#line 7793 "ImportPage.c"
+#line 7801 "ImportPage.c"
 						gint _tmp41_ = 0;
 						GeeArrayList* _tmp42_ = NULL;
 #line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7804,7 +7812,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						import_page_enumerate_files (self, _tmp41_, "/PRIVATE/AVCHD", _tmp42_);
 #line 1208 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7804 "ImportPage.c"
+#line 7812 "ImportPage.c"
 					}
 #line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp43_ = fsid;
@@ -7812,7 +7820,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					_tmp44_ = import_page_check_directory_exists (self, _tmp43_, "/private/", "avchd");
 #line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp44_) {
-#line 7812 "ImportPage.c"
+#line 7820 "ImportPage.c"
 						gint _tmp45_ = 0;
 						GeeArrayList* _tmp46_ = NULL;
 #line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7823,7 +7831,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						import_page_enumerate_files (self, _tmp45_, "/private/avchd", _tmp46_);
 #line 1212 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7823 "ImportPage.c"
+#line 7831 "ImportPage.c"
 					}
 #line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp47_ = fsid;
@@ -7831,7 +7839,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					_tmp48_ = import_page_check_directory_exists (self, _tmp47_, "/", "AVCHD");
 #line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp48_) {
-#line 7831 "ImportPage.c"
+#line 7839 "ImportPage.c"
 						gint _tmp49_ = 0;
 						GeeArrayList* _tmp50_ = NULL;
 #line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7842,7 +7850,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						import_page_enumerate_files (self, _tmp49_, "/AVCHD", _tmp50_);
 #line 1216 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7842 "ImportPage.c"
+#line 7850 "ImportPage.c"
 					}
 #line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp51_ = fsid;
@@ -7850,7 +7858,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					_tmp52_ = import_page_check_directory_exists (self, _tmp51_, "/", "avchd");
 #line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp52_) {
-#line 7850 "ImportPage.c"
+#line 7858 "ImportPage.c"
 						gint _tmp53_ = 0;
 						GeeArrayList* _tmp54_ = NULL;
 #line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7861,7 +7869,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						import_page_enumerate_files (self, _tmp53_, "/avchd", _tmp54_);
 #line 1220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7861 "ImportPage.c"
+#line 7869 "ImportPage.c"
 					}
 #line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp55_ = fsid;
@@ -7869,7 +7877,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					_tmp56_ = import_page_check_directory_exists (self, _tmp55_, "/PRIVATE/", "SONY");
 #line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp56_) {
-#line 7869 "ImportPage.c"
+#line 7877 "ImportPage.c"
 						gint _tmp57_ = 0;
 						GeeArrayList* _tmp58_ = NULL;
 #line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7880,7 +7888,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						import_page_enumerate_files (self, _tmp57_, "/PRIVATE/SONY", _tmp58_);
 #line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7880 "ImportPage.c"
+#line 7888 "ImportPage.c"
 					}
 #line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp59_ = fsid;
@@ -7888,7 +7896,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					_tmp60_ = import_page_check_directory_exists (self, _tmp59_, "/private/", "sony");
 #line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp60_) {
-#line 7888 "ImportPage.c"
+#line 7896 "ImportPage.c"
 						gint _tmp61_ = 0;
 						GeeArrayList* _tmp62_ = NULL;
 #line 1230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7899,7 +7907,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						import_page_enumerate_files (self, _tmp61_, "/private/sony", _tmp62_);
 #line 1231 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7899 "ImportPage.c"
+#line 7907 "ImportPage.c"
 					}
 #line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp63_ = fsid;
@@ -7907,7 +7915,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					_tmp64_ = import_page_check_directory_exists (self, _tmp63_, "/", "MP_ROOT");
 #line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp64_) {
-#line 7907 "ImportPage.c"
+#line 7915 "ImportPage.c"
 						gint _tmp65_ = 0;
 						GeeArrayList* _tmp66_ = NULL;
 #line 1236 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7918,7 +7926,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						import_page_enumerate_files (self, _tmp65_, "/MP_ROOT", _tmp66_);
 #line 1237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7918 "ImportPage.c"
+#line 7926 "ImportPage.c"
 					}
 #line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp67_ = fsid;
@@ -7926,7 +7934,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					_tmp68_ = import_page_check_directory_exists (self, _tmp67_, "/", "mp_root");
 #line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp68_) {
-#line 7926 "ImportPage.c"
+#line 7934 "ImportPage.c"
 						gint _tmp69_ = 0;
 						GeeArrayList* _tmp70_ = NULL;
 #line 1240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7937,13 +7945,13 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						import_page_enumerate_files (self, _tmp69_, "/mp_root", _tmp70_);
 #line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7937 "ImportPage.c"
+#line 7945 "ImportPage.c"
 					}
 #line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp71_ = got_well_known_dir;
 #line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!_tmp71_) {
-#line 7943 "ImportPage.c"
+#line 7951 "ImportPage.c"
 						gint _tmp72_ = 0;
 						GeeArrayList* _tmp73_ = NULL;
 						gboolean _tmp74_ = FALSE;
@@ -7957,7 +7965,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 						if (!_tmp74_) {
 #line 1248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							break;
-#line 7957 "ImportPage.c"
+#line 7965 "ImportPage.c"
 						}
 					}
 				}
@@ -8004,7 +8012,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 	_tmp85_ = res;
 #line 1276 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp85_ != GP_OK) {
-#line 8004 "ImportPage.c"
+#line 8012 "ImportPage.c"
 		int _tmp86_ = 0;
 		gchar* _tmp87_ = NULL;
 		gchar* _tmp88_ = NULL;
@@ -8018,13 +8026,13 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 		g_warning ("ImportPage.vala:1278: Unable to unlock camera: %s", _tmp88_);
 #line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp88_);
-#line 8018 "ImportPage.c"
+#line 8026 "ImportPage.c"
 	}
 #line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp89_ = self->priv->refresh_result;
 #line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp89_ == GP_OK) {
-#line 8024 "ImportPage.c"
+#line 8032 "ImportPage.c"
 		SourceCollection* _tmp90_ = NULL;
 		gint _tmp91_ = 0;
 #line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8033,7 +8041,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 		_tmp91_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_DATA_COLLECTION, DataCollection));
 #line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp91_ == 0) {
-#line 8033 "ImportPage.c"
+#line 8041 "ImportPage.c"
 			gchar* _tmp92_ = NULL;
 			gchar* _tmp93_ = NULL;
 #line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8044,17 +8052,17 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 			checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp93_);
 #line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp93_);
-#line 8044 "ImportPage.c"
+#line 8052 "ImportPage.c"
 		}
 #line 1285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_update_status (self, FALSE, TRUE);
-#line 8048 "ImportPage.c"
+#line 8056 "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 8054 "ImportPage.c"
+#line 8062 "ImportPage.c"
 	}
 #line 1293 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
@@ -8064,7 +8072,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 	switch (_tmp94_) {
 #line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case GP_OK:
-#line 8064 "ImportPage.c"
+#line 8072 "ImportPage.c"
 		{
 #line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = IMPORT_PAGE_REFRESH_RESULT_OK;
@@ -8072,11 +8080,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 8072 "ImportPage.c"
+#line 8080 "ImportPage.c"
 		}
 #line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case GP_ERROR_IO_LOCK:
-#line 8076 "ImportPage.c"
+#line 8084 "ImportPage.c"
 		{
 #line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
@@ -8084,7 +8092,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 8084 "ImportPage.c"
+#line 8092 "ImportPage.c"
 		}
 		default:
 		{
@@ -8094,12 +8102,12 @@ 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 8094 "ImportPage.c"
+#line 8102 "ImportPage.c"
 		}
 	}
 #line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (import_list);
-#line 8099 "ImportPage.c"
+#line 8107 "ImportPage.c"
 }
 
 
@@ -8117,7 +8125,7 @@ static gchar string_get (const gchar* self, glong index) {
 	result = _tmp1_;
 #line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 8117 "ImportPage.c"
+#line 8125 "ImportPage.c"
 }
 
 
@@ -8150,7 +8158,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp2_ = start;
 #line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 8150 "ImportPage.c"
+#line 8158 "ImportPage.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -8159,13 +8167,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp4_ = start;
 #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 8159 "ImportPage.c"
+#line 8167 "ImportPage.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 8165 "ImportPage.c"
+#line 8173 "ImportPage.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
 #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -8174,13 +8182,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp7_ = end;
 #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 8174 "ImportPage.c"
+#line 8182 "ImportPage.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 8180 "ImportPage.c"
+#line 8188 "ImportPage.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -8189,11 +8197,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp11_ = string_length;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 8189 "ImportPage.c"
+#line 8197 "ImportPage.c"
 	} else {
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 8193 "ImportPage.c"
+#line 8201 "ImportPage.c"
 	}
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
@@ -8201,7 +8209,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp13_ = end;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 8201 "ImportPage.c"
+#line 8209 "ImportPage.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -8210,11 +8218,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp15_ = string_length;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 8210 "ImportPage.c"
+#line 8218 "ImportPage.c"
 	} else {
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 8214 "ImportPage.c"
+#line 8222 "ImportPage.c"
 	}
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
@@ -8236,7 +8244,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	result = _tmp21_;
 #line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 8236 "ImportPage.c"
+#line 8244 "ImportPage.c"
 }
 
 
@@ -8259,7 +8267,7 @@ 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 8259 "ImportPage.c"
+#line 8267 "ImportPage.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		const gchar* _tmp5_ = NULL;
@@ -8276,7 +8284,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 8276 "ImportPage.c"
+#line 8284 "ImportPage.c"
 		}
 #line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = str;
@@ -8288,7 +8296,7 @@ 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 8288 "ImportPage.c"
+#line 8296 "ImportPage.c"
 			const gchar* _tmp9_ = NULL;
 			glong _tmp10_ = 0L;
 			gchar* _tmp11_ = NULL;
@@ -8302,7 +8310,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 8302 "ImportPage.c"
+#line 8310 "ImportPage.c"
 		}
 	}
 #line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8311,7 +8319,7 @@ 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 8311 "ImportPage.c"
+#line 8319 "ImportPage.c"
 }
 
 
@@ -8330,7 +8338,7 @@ 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 8330 "ImportPage.c"
+#line 8338 "ImportPage.c"
 		const gchar* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
 #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8339,15 +8347,15 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
 		_tmp4_ = g_str_has_prefix (_tmp3_, "/");
 #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 8339 "ImportPage.c"
+#line 8347 "ImportPage.c"
 	} else {
 #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = FALSE;
-#line 8343 "ImportPage.c"
+#line 8351 "ImportPage.c"
 	}
 #line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
-#line 8347 "ImportPage.c"
+#line 8355 "ImportPage.c"
 		const gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
@@ -8372,7 +8380,7 @@ 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 8372 "ImportPage.c"
+#line 8380 "ImportPage.c"
 	} else {
 		gboolean _tmp11_ = FALSE;
 		const gchar* _tmp12_ = NULL;
@@ -8383,7 +8391,7 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
 		_tmp13_ = g_str_has_suffix (_tmp12_, "/");
 #line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp13_) {
-#line 8383 "ImportPage.c"
+#line 8391 "ImportPage.c"
 			const gchar* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
 #line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8392,15 +8400,15 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
 			_tmp15_ = g_str_has_prefix (_tmp14_, "/");
 #line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = _tmp15_;
-#line 8392 "ImportPage.c"
+#line 8400 "ImportPage.c"
 		} else {
 #line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = FALSE;
-#line 8396 "ImportPage.c"
+#line 8404 "ImportPage.c"
 		}
 #line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp11_) {
-#line 8400 "ImportPage.c"
+#line 8408 "ImportPage.c"
 			const gchar* _tmp16_ = NULL;
 			gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
@@ -8425,7 +8433,7 @@ 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 8425 "ImportPage.c"
+#line 8433 "ImportPage.c"
 		} else {
 			const gchar* _tmp22_ = NULL;
 			const gchar* _tmp23_ = NULL;
@@ -8440,7 +8448,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 8440 "ImportPage.c"
+#line 8448 "ImportPage.c"
 		}
 	}
 }
@@ -8492,7 +8500,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 8492 "ImportPage.c"
+#line 8500 "ImportPage.c"
 	}
 #line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = fsid;
@@ -8504,7 +8512,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 8504 "ImportPage.c"
+#line 8512 "ImportPage.c"
 	}
 #line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = sifs;
@@ -8518,7 +8526,7 @@ 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 8518 "ImportPage.c"
+#line 8526 "ImportPage.c"
 		CameraStorageInformation* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
 #line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8527,11 +8535,11 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
 		_tmp14_ = (*_tmp13_).basedir;
 #line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = _tmp14_;
-#line 8527 "ImportPage.c"
+#line 8535 "ImportPage.c"
 	} else {
 #line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = "/";
-#line 8531 "ImportPage.c"
+#line 8539 "ImportPage.c"
 	}
 #line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp15_ = g_strdup (_tmp10_);
@@ -8539,7 +8547,7 @@ 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 8539 "ImportPage.c"
+#line 8547 "ImportPage.c"
 }
 
 
@@ -8574,7 +8582,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 8574 "ImportPage.c"
+#line 8582 "ImportPage.c"
 	}
 #line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = camera;
@@ -8588,7 +8596,7 @@ 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 8588 "ImportPage.c"
+#line 8596 "ImportPage.c"
 		const gchar* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
 		const gchar* _tmp9_ = NULL;
@@ -8609,7 +8617,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 8609 "ImportPage.c"
+#line 8617 "ImportPage.c"
 	}
 #line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = basedir;
@@ -8623,7 +8631,7 @@ 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 8623 "ImportPage.c"
+#line 8631 "ImportPage.c"
 }
 
 
@@ -8648,16 +8656,16 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 	int _tmp18_ = 0;
 	int _tmp19_ = 0;
 	CameraList* folders = NULL;
-	CameraList* _tmp109_ = NULL;
-	int _tmp110_ = 0;
+	CameraList* _tmp110_ = NULL;
 	int _tmp111_ = 0;
-	Camera* _tmp115_ = NULL;
-	const gchar* _tmp116_ = NULL;
-	CameraList* _tmp117_ = NULL;
-	GPSpinIdleWrapper* _tmp118_ = NULL;
-	GPContext* _tmp119_ = NULL;
-	int _tmp120_ = 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;
 	GError * _inner_error_ = NULL;
 #line 1357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
@@ -8681,7 +8689,7 @@ 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 8681 "ImportPage.c"
+#line 8689 "ImportPage.c"
 		const gchar* _tmp6_ = NULL;
 #line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = dir;
@@ -8693,7 +8701,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 8693 "ImportPage.c"
+#line 8701 "ImportPage.c"
 	}
 #line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = gp_list_new (&_tmp7_);
@@ -8707,7 +8715,7 @@ 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 8707 "ImportPage.c"
+#line 8715 "ImportPage.c"
 		int _tmp10_ = 0;
 		gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
@@ -8729,7 +8737,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 8729 "ImportPage.c"
+#line 8737 "ImportPage.c"
 	}
 #line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = self->priv->camera;
@@ -8749,7 +8757,7 @@ 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 8749 "ImportPage.c"
+#line 8757 "ImportPage.c"
 		const gchar* _tmp20_ = NULL;
 		int _tmp21_ = 0;
 		gchar* _tmp22_ = NULL;
@@ -8776,20 +8784,20 @@ 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 8776 "ImportPage.c"
+#line 8784 "ImportPage.c"
 	}
 	{
 		gint ctr = 0;
 #line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		ctr = 0;
-#line 8782 "ImportPage.c"
+#line 8790 "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 8789 "ImportPage.c"
+#line 8797 "ImportPage.c"
 				gint _tmp26_ = 0;
 				CameraList* _tmp27_ = NULL;
 				gint _tmp28_ = 0;
@@ -8802,13 +8810,13 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 				int _tmp34_ = 0;
 #line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp24_) {
-#line 8802 "ImportPage.c"
+#line 8810 "ImportPage.c"
 					gint _tmp25_ = 0;
 #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 8808 "ImportPage.c"
+#line 8816 "ImportPage.c"
 				}
 #line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp24_ = FALSE;
@@ -8822,7 +8830,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 8822 "ImportPage.c"
+#line 8830 "ImportPage.c"
 				}
 #line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp29_ = files;
@@ -8842,7 +8850,7 @@ 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 8842 "ImportPage.c"
+#line 8850 "ImportPage.c"
 					gint _tmp35_ = 0;
 					const gchar* _tmp36_ = NULL;
 					int _tmp37_ = 0;
@@ -8872,7 +8880,7 @@ 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 8872 "ImportPage.c"
+#line 8880 "ImportPage.c"
 				}
 				{
 					CameraFileInfo info = {0};
@@ -8912,12 +8920,12 @@ 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 8912 "ImportPage.c"
+#line 8920 "ImportPage.c"
 						goto __catch67_g_error;
 					}
 #line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!_tmp40_) {
-#line 8917 "ImportPage.c"
+#line 8925 "ImportPage.c"
 						const gchar* _tmp48_ = NULL;
 						const gchar* _tmp49_ = NULL;
 #line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8932,7 +8940,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 8932 "ImportPage.c"
+#line 8940 "ImportPage.c"
 					}
 #line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp50_ = info;
@@ -8942,7 +8950,7 @@ 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 8942 "ImportPage.c"
+#line 8950 "ImportPage.c"
 						const gchar* _tmp53_ = NULL;
 						const gchar* _tmp54_ = NULL;
 						CameraFileInfo _tmp55_ = {0};
@@ -8966,7 +8974,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 8966 "ImportPage.c"
+#line 8974 "ImportPage.c"
 					}
 #line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp58_ = filename;
@@ -8974,7 +8982,7 @@ 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 8974 "ImportPage.c"
+#line 8982 "ImportPage.c"
 						VideoImportSource* video_source = NULL;
 						const gchar* _tmp60_ = NULL;
 						Camera* _tmp61_ = NULL;
@@ -9024,7 +9032,7 @@ 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 9024 "ImportPage.c"
+#line 9032 "ImportPage.c"
 					} else {
 						PhotoFileFormat file_format = 0;
 						CameraFileInfo _tmp74_ = {0};
@@ -9061,7 +9069,7 @@ 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 9061 "ImportPage.c"
+#line 9069 "ImportPage.c"
 							const gchar* _tmp79_ = NULL;
 							PhotoFileFormat _tmp80_ = 0;
 							PhotoFileFormat _tmp81_ = 0;
@@ -9075,7 +9083,7 @@ 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 9075 "ImportPage.c"
+#line 9083 "ImportPage.c"
 								const gchar* _tmp82_ = NULL;
 								const gchar* _tmp83_ = NULL;
 								CameraFileInfo _tmp84_ = {0};
@@ -9100,7 +9108,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 9099 "ImportPage.c"
+#line 9107 "ImportPage.c"
 							}
 						}
 #line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9137,7 +9145,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 9136 "ImportPage.c"
+#line 9144 "ImportPage.c"
 					}
 #line 1428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp102_ = self->priv->progress_bar;
@@ -9147,7 +9155,7 @@ 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 9146 "ImportPage.c"
+#line 9154 "ImportPage.c"
 				}
 				goto __finally67;
 				__catch67_g_error:
@@ -9193,11 +9201,13 @@ 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 9192 "ImportPage.c"
+#line 9200 "ImportPage.c"
 				}
 				__finally67:
 #line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 9205 "ImportPage.c"
+					gboolean _tmp109_ = FALSE;
 #line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (filename);
 #line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9209,41 +9219,41 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 #line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					g_clear_error (&_inner_error_);
 #line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					return FALSE;
-#line 9209 "ImportPage.c"
+					return _tmp109_;
+#line 9219 "ImportPage.c"
 				}
 #line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (filename);
-#line 9213 "ImportPage.c"
+#line 9223 "ImportPage.c"
 			}
 		}
 	}
 #line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp110_ = gp_list_new (&_tmp109_);
+	_tmp111_ = gp_list_new (&_tmp110_);
 #line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_list_unref0 (folders);
 #line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	folders = _tmp109_;
+	folders = _tmp110_;
 #line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	self->priv->refresh_result = _tmp110_;
+	self->priv->refresh_result = _tmp111_;
 #line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp111_ = self->priv->refresh_result;
+	_tmp112_ = self->priv->refresh_result;
 #line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp111_ != GP_OK) {
-#line 9229 "ImportPage.c"
-		int _tmp112_ = 0;
-		gchar* _tmp113_ = NULL;
+	if (_tmp112_ != GP_OK) {
+#line 9239 "ImportPage.c"
+		int _tmp113_ = 0;
 		gchar* _tmp114_ = NULL;
+		gchar* _tmp115_ = NULL;
 #line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp112_ = self->priv->refresh_result;
+		_tmp113_ = self->priv->refresh_result;
 #line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp113_ = gp_result_to_full_string (_tmp112_);
+		_tmp114_ = gp_result_to_full_string (_tmp113_);
 #line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp114_ = _tmp113_;
+		_tmp115_ = _tmp114_;
 #line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_warning ("ImportPage.vala:1444: Unable to create folder list: %s", _tmp114_);
+		g_warning ("ImportPage.vala:1444: Unable to create folder list: %s", _tmp115_);
 #line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_free0 (_tmp114_);
+		_g_free0 (_tmp115_);
 #line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
 #line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9254,43 +9264,43 @@ 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 9253 "ImportPage.c"
+#line 9263 "ImportPage.c"
 	}
 #line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp115_ = self->priv->camera;
+	_tmp116_ = self->priv->camera;
 #line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp116_ = fulldir;
+	_tmp117_ = fulldir;
 #line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp117_ = folders;
+	_tmp118_ = folders;
 #line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp118_ = import_page_spin_idle_context;
+	_tmp119_ = import_page_spin_idle_context;
 #line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp119_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+	_tmp120_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
 #line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp120_ = gp_camera_folder_list_folders (_tmp115_, _tmp116_, _tmp117_, _tmp119_);
+	_tmp121_ = gp_camera_folder_list_folders (_tmp116_, _tmp117_, _tmp118_, _tmp120_);
 #line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	self->priv->refresh_result = _tmp120_;
+	self->priv->refresh_result = _tmp121_;
 #line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp121_ = self->priv->refresh_result;
+	_tmp122_ = self->priv->refresh_result;
 #line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp121_ != GP_OK) {
-#line 9273 "ImportPage.c"
-		const gchar* _tmp122_ = NULL;
-		int _tmp123_ = 0;
-		gchar* _tmp124_ = NULL;
+	if (_tmp122_ != GP_OK) {
+#line 9283 "ImportPage.c"
+		const gchar* _tmp123_ = NULL;
+		int _tmp124_ = 0;
 		gchar* _tmp125_ = NULL;
+		gchar* _tmp126_ = NULL;
 #line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp122_ = fulldir;
+		_tmp123_ = fulldir;
 #line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp123_ = self->priv->refresh_result;
+		_tmp124_ = self->priv->refresh_result;
 #line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp124_ = gp_result_to_full_string (_tmp123_);
+		_tmp125_ = gp_result_to_full_string (_tmp124_);
 #line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp125_ = _tmp124_;
+		_tmp126_ = _tmp125_;
 #line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_warning ("ImportPage.vala:1451: Unable to list folders in %s: %s", _tmp122_, _tmp125_);
+		g_warning ("ImportPage.vala:1451: Unable to list folders in %s: %s", _tmp123_, _tmp126_);
 #line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_free0 (_tmp125_);
+		_g_free0 (_tmp126_);
 #line 1454 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		self->priv->refresh_result = GP_OK;
 #line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9303,97 +9313,97 @@ 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 9302 "ImportPage.c"
+#line 9312 "ImportPage.c"
 	}
 	{
 		gint ctr = 0;
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		ctr = 0;
-#line 9308 "ImportPage.c"
+#line 9318 "ImportPage.c"
 		{
-			gboolean _tmp126_ = FALSE;
+			gboolean _tmp127_ = FALSE;
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp126_ = TRUE;
+			_tmp127_ = TRUE;
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			while (TRUE) {
-#line 9315 "ImportPage.c"
-				gint _tmp128_ = 0;
-				CameraList* _tmp129_ = NULL;
-				gint _tmp130_ = 0;
+#line 9325 "ImportPage.c"
+				gint _tmp129_ = 0;
+				CameraList* _tmp130_ = NULL;
+				gint _tmp131_ = 0;
 				gchar* subdir = NULL;
-				CameraList* _tmp131_ = NULL;
-				gint _tmp132_ = 0;
-				const gchar* _tmp133_ = NULL;
-				int _tmp134_ = 0;
-				gchar* _tmp135_ = NULL;
-				int _tmp136_ = 0;
-				gint _tmp141_ = 0;
-				const gchar* _tmp142_ = NULL;
+				CameraList* _tmp132_ = NULL;
+				gint _tmp133_ = 0;
+				const gchar* _tmp134_ = NULL;
+				int _tmp135_ = 0;
+				gchar* _tmp136_ = NULL;
+				int _tmp137_ = 0;
+				gint _tmp142_ = 0;
 				const gchar* _tmp143_ = NULL;
-				gchar* _tmp144_ = NULL;
+				const gchar* _tmp144_ = NULL;
 				gchar* _tmp145_ = NULL;
-				GeeArrayList* _tmp146_ = NULL;
-				gboolean _tmp147_ = FALSE;
+				gchar* _tmp146_ = NULL;
+				GeeArrayList* _tmp147_ = NULL;
 				gboolean _tmp148_ = FALSE;
+				gboolean _tmp149_ = FALSE;
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (!_tmp126_) {
-#line 9336 "ImportPage.c"
-					gint _tmp127_ = 0;
+				if (!_tmp127_) {
+#line 9346 "ImportPage.c"
+					gint _tmp128_ = 0;
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp127_ = ctr;
+					_tmp128_ = ctr;
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					ctr = _tmp127_ + 1;
-#line 9342 "ImportPage.c"
+					ctr = _tmp128_ + 1;
+#line 9352 "ImportPage.c"
 				}
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp126_ = FALSE;
+				_tmp127_ = FALSE;
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp128_ = ctr;
+				_tmp129_ = ctr;
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp129_ = folders;
+				_tmp130_ = folders;
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp130_ = gp_list_count (_tmp129_);
+				_tmp131_ = gp_list_count (_tmp130_);
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (!(_tmp128_ < _tmp130_)) {
+				if (!(_tmp129_ < _tmp131_)) {
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 9356 "ImportPage.c"
+#line 9366 "ImportPage.c"
 				}
 #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp131_ = folders;
+				_tmp132_ = folders;
 #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp132_ = ctr;
+				_tmp133_ = ctr;
 #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp134_ = gp_list_get_name (_tmp131_, _tmp132_, &_tmp133_);
+				_tmp135_ = gp_list_get_name (_tmp132_, _tmp133_, &_tmp134_);
 #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (subdir);
 #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp135_ = g_strdup (_tmp133_);
+				_tmp136_ = g_strdup (_tmp134_);
 #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				subdir = _tmp135_;
+				subdir = _tmp136_;
 #line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				self->priv->refresh_result = _tmp134_;
+				self->priv->refresh_result = _tmp135_;
 #line 1462 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp136_ = self->priv->refresh_result;
+				_tmp137_ = self->priv->refresh_result;
 #line 1462 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (_tmp136_ != GP_OK) {
-#line 9376 "ImportPage.c"
-					gint _tmp137_ = 0;
-					int _tmp138_ = 0;
-					gchar* _tmp139_ = NULL;
+				if (_tmp137_ != GP_OK) {
+#line 9386 "ImportPage.c"
+					gint _tmp138_ = 0;
+					int _tmp139_ = 0;
 					gchar* _tmp140_ = NULL;
+					gchar* _tmp141_ = NULL;
 #line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp137_ = ctr;
+					_tmp138_ = ctr;
 #line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp138_ = self->priv->refresh_result;
+					_tmp139_ = self->priv->refresh_result;
 #line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp139_ = gp_result_to_full_string (_tmp138_);
+					_tmp140_ = gp_result_to_full_string (_tmp139_);
 #line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp140_ = _tmp139_;
+					_tmp141_ = _tmp140_;
 #line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					g_warning ("ImportPage.vala:1463: Unable to get name of folder %d: %s", _tmp137_, _tmp140_);
+					g_warning ("ImportPage.vala:1463: Unable to get name of folder %d: %s", _tmp138_, _tmp141_);
 #line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_g_free0 (_tmp140_);
+					_g_free0 (_tmp141_);
 #line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					result = FALSE;
 #line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9406,28 +9416,28 @@ 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 9405 "ImportPage.c"
+#line 9415 "ImportPage.c"
 				}
 #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp141_ = fsid;
+				_tmp142_ = fsid;
 #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp142_ = dir;
+				_tmp143_ = dir;
 #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp143_ = subdir;
+				_tmp144_ = subdir;
 #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp144_ = import_page_append_path (_tmp142_, _tmp143_);
+				_tmp145_ = import_page_append_path (_tmp143_, _tmp144_);
 #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp145_ = _tmp144_;
+				_tmp146_ = _tmp145_;
 #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp146_ = import_list;
+				_tmp147_ = import_list;
 #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp147_ = import_page_enumerate_files (self, _tmp141_, _tmp145_, _tmp146_);
+				_tmp148_ = import_page_enumerate_files (self, _tmp142_, _tmp146_, _tmp147_);
 #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp148_ = !_tmp147_;
+				_tmp149_ = !_tmp148_;
 #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_g_free0 (_tmp145_);
+				_g_free0 (_tmp146_);
 #line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (_tmp148_) {
+				if (_tmp149_) {
 #line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					result = FALSE;
 #line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9440,11 +9450,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 9439 "ImportPage.c"
+#line 9449 "ImportPage.c"
 				}
 #line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (subdir);
-#line 9443 "ImportPage.c"
+#line 9453 "ImportPage.c"
 			}
 		}
 	}
@@ -9458,7 +9468,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 9457 "ImportPage.c"
+#line 9467 "ImportPage.c"
 }
 
 
@@ -9467,19 +9477,19 @@ 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 9466 "ImportPage.c"
+#line 9476 "ImportPage.c"
 	{
 		gint i = 0;
 #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		i = 0;
-#line 9471 "ImportPage.c"
+#line 9481 "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 9478 "ImportPage.c"
+#line 9488 "ImportPage.c"
 				gint _tmp2_ = 0;
 				GeeArrayList* _tmp3_ = NULL;
 				gint _tmp4_ = 0;
@@ -9505,13 +9515,13 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 				PhotoImportSource* _tmp31_ = NULL;
 #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp0_) {
-#line 9504 "ImportPage.c"
+#line 9514 "ImportPage.c"
 					gint _tmp1_ = 0;
 #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 9510 "ImportPage.c"
+#line 9520 "ImportPage.c"
 				}
 #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp0_ = FALSE;
@@ -9520,14 +9530,14 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp3_ = import_list;
 #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+				_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp5_ = _tmp4_;
 #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!(_tmp2_ < _tmp5_)) {
 #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 9526 "ImportPage.c"
+#line 9536 "ImportPage.c"
 				}
 #line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp6_ = import_list;
@@ -9543,7 +9553,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 9542 "ImportPage.c"
+#line 9552 "ImportPage.c"
 				}
 #line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				current = _tmp10_;
@@ -9552,12 +9562,12 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 #line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp13_ = import_list;
 #line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp14_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection));
+				_tmp14_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp15_ = _tmp14_;
 #line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if ((_tmp12_ + 1) < _tmp15_) {
-#line 9556 "ImportPage.c"
+#line 9566 "ImportPage.c"
 					GeeArrayList* _tmp16_ = NULL;
 					gint _tmp17_ = 0;
 					gpointer _tmp18_ = NULL;
@@ -9577,19 +9587,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 9576 "ImportPage.c"
+#line 9586 "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 9582 "ImportPage.c"
+#line 9592 "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 9588 "ImportPage.c"
+#line 9598 "ImportPage.c"
 				}
 #line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp21_ = _g_object_ref0 (_tmp11_);
@@ -9599,7 +9609,7 @@ 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 9598 "ImportPage.c"
+#line 9608 "ImportPage.c"
 					GeeArrayList* _tmp24_ = NULL;
 					gint _tmp25_ = 0;
 					gpointer _tmp26_ = NULL;
@@ -9619,19 +9629,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 9618 "ImportPage.c"
+#line 9628 "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 9624 "ImportPage.c"
+#line 9634 "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 9630 "ImportPage.c"
+#line 9640 "ImportPage.c"
 				}
 #line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp29_ = _g_object_ref0 (_tmp22_);
@@ -9641,7 +9651,7 @@ 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 9640 "ImportPage.c"
+#line 9650 "ImportPage.c"
 					PhotoImportSource* _tmp32_ = NULL;
 					PhotoFileFormat _tmp33_ = 0;
 #line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9650,15 +9660,15 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 					_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 9649 "ImportPage.c"
+#line 9659 "ImportPage.c"
 				} else {
 #line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp30_ = FALSE;
-#line 9653 "ImportPage.c"
+#line 9663 "ImportPage.c"
 				}
 #line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp30_) {
-#line 9657 "ImportPage.c"
+#line 9667 "ImportPage.c"
 					gchar* current_name = NULL;
 					gchar* ext = NULL;
 					PhotoImportSource* _tmp34_ = NULL;
@@ -9696,7 +9706,7 @@ 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 9695 "ImportPage.c"
+#line 9705 "ImportPage.c"
 						PhotoImportSource* _tmp41_ = NULL;
 						PhotoFileFormat _tmp42_ = 0;
 #line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9705,15 +9715,15 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 						_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 9704 "ImportPage.c"
+#line 9714 "ImportPage.c"
 					} else {
 #line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp39_ = FALSE;
-#line 9708 "ImportPage.c"
+#line 9718 "ImportPage.c"
 					}
 #line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp39_) {
-#line 9712 "ImportPage.c"
+#line 9722 "ImportPage.c"
 						gchar* next_name = NULL;
 						PhotoImportSource* _tmp43_ = NULL;
 						gchar* _tmp44_ = NULL;
@@ -9746,7 +9756,7 @@ 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 9745 "ImportPage.c"
+#line 9755 "ImportPage.c"
 							PhotoImportSource* _tmp50_ = NULL;
 							PhotoImportSource* _tmp51_ = NULL;
 #line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9757,17 +9767,17 @@ 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 9756 "ImportPage.c"
+#line 9766 "ImportPage.c"
 						}
 #line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (next_name);
-#line 9760 "ImportPage.c"
+#line 9770 "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 9766 "ImportPage.c"
+#line 9776 "ImportPage.c"
 						PhotoImportSource* _tmp54_ = NULL;
 						PhotoFileFormat _tmp55_ = 0;
 #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9776,15 +9786,15 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 						_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 9775 "ImportPage.c"
+#line 9785 "ImportPage.c"
 					} else {
 #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp52_ = FALSE;
-#line 9779 "ImportPage.c"
+#line 9789 "ImportPage.c"
 					}
 #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp52_) {
-#line 9783 "ImportPage.c"
+#line 9793 "ImportPage.c"
 						gchar* prev_name = NULL;
 						PhotoImportSource* _tmp56_ = NULL;
 						gchar* _tmp57_ = NULL;
@@ -9817,7 +9827,7 @@ 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 9816 "ImportPage.c"
+#line 9826 "ImportPage.c"
 							PhotoImportSource* _tmp63_ = NULL;
 							PhotoImportSource* _tmp64_ = NULL;
 #line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9828,17 +9838,17 @@ 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 9827 "ImportPage.c"
+#line 9837 "ImportPage.c"
 						}
 #line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (prev_name);
-#line 9831 "ImportPage.c"
+#line 9841 "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 9837 "ImportPage.c"
+#line 9847 "ImportPage.c"
 						PhotoImportSource* _tmp66_ = NULL;
 						gchar* _tmp67_ = NULL;
 						gchar* _tmp68_ = NULL;
@@ -9882,7 +9892,7 @@ 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 9881 "ImportPage.c"
+#line 9891 "ImportPage.c"
 							PhotoImportSource* _tmp77_ = NULL;
 #line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							g_debug ("ImportPage.vala:1508: Unable to associate files");
@@ -9890,7 +9900,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 							_tmp77_ = current;
 #line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							photo_import_source_set_associated (_tmp77_, NULL);
-#line 9889 "ImportPage.c"
+#line 9899 "ImportPage.c"
 						}
 					}
 #line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9899,7 +9909,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 9898 "ImportPage.c"
+#line 9908 "ImportPage.c"
 				}
 #line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (prev);
@@ -9911,7 +9921,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 9910 "ImportPage.c"
+#line 9920 "ImportPage.c"
 			}
 		}
 	}
@@ -9927,7 +9937,7 @@ 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 9926 "ImportPage.c"
+#line 9936 "ImportPage.c"
 	{
 		GeeList* _import_source_list = NULL;
 		GeeList* _tmp0_ = NULL;
@@ -9955,7 +9965,7 @@ 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 9954 "ImportPage.c"
+#line 9964 "ImportPage.c"
 			gint _tmp5_ = 0;
 			gint _tmp6_ = 0;
 			gint _tmp7_ = 0;
@@ -10018,7 +10028,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 10017 "ImportPage.c"
+#line 10027 "ImportPage.c"
 			}
 #line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp8_ = _import_source_list;
@@ -10044,7 +10054,7 @@ 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 10043 "ImportPage.c"
+#line 10053 "ImportPage.c"
 				ImportSource* _tmp16_ = NULL;
 				gchar* _tmp17_ = NULL;
 				gchar* _tmp18_ = NULL;
@@ -10067,7 +10077,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 10065 "ImportPage.c"
+#line 10075 "ImportPage.c"
 			}
 #line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			associated = NULL;
@@ -10075,7 +10085,7 @@ 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 10073 "ImportPage.c"
+#line 10083 "ImportPage.c"
 				ImportSource* _tmp21_ = NULL;
 				PhotoImportSource* _tmp22_ = NULL;
 				PhotoImportSource* _tmp23_ = NULL;
@@ -10089,15 +10099,15 @@ 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 10087 "ImportPage.c"
+#line 10097 "ImportPage.c"
 			} else {
 #line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp19_ = FALSE;
-#line 10091 "ImportPage.c"
+#line 10101 "ImportPage.c"
 			}
 #line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp19_) {
-#line 10095 "ImportPage.c"
+#line 10105 "ImportPage.c"
 				ImportSource* _tmp24_ = NULL;
 				PhotoImportSource* _tmp25_ = NULL;
 #line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10108,7 +10118,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 10106 "ImportPage.c"
+#line 10116 "ImportPage.c"
 			}
 #line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp26_ = self->priv->progress_bar;
@@ -10142,7 +10152,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 			_tmp35_ = video_reader_is_supported_video_filename (_tmp34_);
 #line 1543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (!_tmp35_) {
-#line 10140 "ImportPage.c"
+#line 10150 "ImportPage.c"
 				{
 					PhotoMetadata* _tmp36_ = NULL;
 					GPSpinIdleWrapper* _tmp37_ = NULL;
@@ -10168,7 +10178,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_tmp36_ = _tmp42_;
 #line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10166 "ImportPage.c"
+#line 10176 "ImportPage.c"
 						goto __catch68_g_error;
 					}
 #line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10181,7 +10191,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					metadata = _tmp43_;
 #line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_media_metadata_unref0 (_tmp36_);
-#line 10179 "ImportPage.c"
+#line 10189 "ImportPage.c"
 				}
 				goto __finally68;
 				__catch68_g_error:
@@ -10207,7 +10217,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					g_warning ("ImportPage.vala:1548: Unable to fetch metadata for %s/%s: %s", _tmp44_, _tmp45_, _tmp47_);
 #line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_error_free0 (err);
-#line 10205 "ImportPage.c"
+#line 10215 "ImportPage.c"
 				}
 				__finally68:
 #line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10230,7 +10240,7 @@ 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 10228 "ImportPage.c"
+#line 10238 "ImportPage.c"
 				}
 			}
 #line 1554 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10239,7 +10249,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 			_tmp48_ = metadata;
 #line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp48_ != NULL) {
-#line 10237 "ImportPage.c"
+#line 10247 "ImportPage.c"
 				guint8* flattened_sans_thumbnail = NULL;
 				PhotoMetadata* _tmp49_ = NULL;
 				gint _tmp50_ = 0;
@@ -10265,7 +10275,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_tmp53__length1 = flattened_sans_thumbnail_length1;
 #line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp53_ != NULL) {
-#line 10263 "ImportPage.c"
+#line 10273 "ImportPage.c"
 					guint8* _tmp54_ = NULL;
 					gint _tmp54__length1 = 0;
 #line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10274,15 +10284,15 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_tmp54__length1 = flattened_sans_thumbnail_length1;
 #line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp52_ = _tmp54__length1 > 0;
-#line 10272 "ImportPage.c"
+#line 10282 "ImportPage.c"
 				} else {
 #line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp52_ = FALSE;
-#line 10276 "ImportPage.c"
+#line 10286 "ImportPage.c"
 				}
 #line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp52_) {
-#line 10280 "ImportPage.c"
+#line 10290 "ImportPage.c"
 					guint8* _tmp55_ = NULL;
 					gint _tmp55__length1 = 0;
 					guint8* _tmp56_ = NULL;
@@ -10302,11 +10312,11 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_g_free0 (exif_only_md5);
 #line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					exif_only_md5 = _tmp57_;
-#line 10300 "ImportPage.c"
+#line 10310 "ImportPage.c"
 				}
 #line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL);
-#line 10304 "ImportPage.c"
+#line 10314 "ImportPage.c"
 			}
 #line 1567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview_raw = NULL;
@@ -10318,7 +10328,7 @@ 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 10316 "ImportPage.c"
+#line 10326 "ImportPage.c"
 			{
 				gchar* preview_fulldir = NULL;
 				const gchar* _tmp58_ = NULL;
@@ -10354,7 +10364,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_tmp62_ = associated;
 #line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp62_ != NULL) {
-#line 10352 "ImportPage.c"
+#line 10362 "ImportPage.c"
 					PhotoImportSource* _tmp63_ = NULL;
 					gchar* _tmp64_ = NULL;
 					PhotoImportSource* _tmp65_ = NULL;
@@ -10375,7 +10385,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_g_free0 (preview_filename);
 #line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					preview_filename = _tmp66_;
-#line 10373 "ImportPage.c"
+#line 10383 "ImportPage.c"
 				}
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp68_ = import_page_spin_idle_context;
@@ -10407,7 +10417,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_g_free0 (preview_filename);
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_fulldir);
-#line 10405 "ImportPage.c"
+#line 10415 "ImportPage.c"
 					goto __catch69_g_error;
 				}
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10424,7 +10434,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_g_free0 (preview_filename);
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (preview_fulldir);
-#line 10422 "ImportPage.c"
+#line 10432 "ImportPage.c"
 			}
 			goto __finally69;
 			__catch69_g_error:
@@ -10442,7 +10452,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_tmp79_ = video_reader_is_supported_video_filename (_tmp78_);
 #line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp79_) {
-#line 10440 "ImportPage.c"
+#line 10450 "ImportPage.c"
 					const gchar* _tmp80_ = NULL;
 					const gchar* _tmp81_ = NULL;
 					GError* _tmp82_ = NULL;
@@ -10457,11 +10467,11 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_tmp83_ = _tmp82_->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 10455 "ImportPage.c"
+#line 10465 "ImportPage.c"
 				}
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_error_free0 (err);
-#line 10459 "ImportPage.c"
+#line 10469 "ImportPage.c"
 			}
 			__finally69:
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10490,7 +10500,7 @@ 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 10488 "ImportPage.c"
+#line 10498 "ImportPage.c"
 			}
 #line 1591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview_md5 = NULL;
@@ -10498,7 +10508,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 			_tmp86_ = preview;
 #line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp86_ != NULL) {
-#line 10496 "ImportPage.c"
+#line 10506 "ImportPage.c"
 				guint8* _tmp87_ = NULL;
 				gint _tmp87__length1 = 0;
 #line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10507,29 +10517,29 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_tmp87__length1 = preview_raw_length1;
 #line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp85_ = _tmp87_ != NULL;
-#line 10505 "ImportPage.c"
+#line 10515 "ImportPage.c"
 			} else {
 #line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp85_ = FALSE;
-#line 10509 "ImportPage.c"
+#line 10519 "ImportPage.c"
 			}
 #line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp85_) {
-#line 10513 "ImportPage.c"
+#line 10523 "ImportPage.c"
 				gsize _tmp88_ = 0UL;
 #line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp88_ = preview_raw_length;
 #line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp84_ = _tmp88_ > ((gsize) 0);
-#line 10519 "ImportPage.c"
+#line 10529 "ImportPage.c"
 			} else {
 #line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp84_ = FALSE;
-#line 10523 "ImportPage.c"
+#line 10533 "ImportPage.c"
 			}
 #line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp84_) {
-#line 10527 "ImportPage.c"
+#line 10537 "ImportPage.c"
 				guint8* _tmp89_ = NULL;
 				gint _tmp89__length1 = 0;
 				gsize _tmp90_ = 0UL;
@@ -10546,13 +10556,13 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_g_free0 (preview_md5);
 #line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				preview_md5 = _tmp91_;
-#line 10544 "ImportPage.c"
+#line 10554 "ImportPage.c"
 			}
 #line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp92_ = import_source;
 #line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp92_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 10550 "ImportPage.c"
+#line 10560 "ImportPage.c"
 				ImportSource* _tmp93_ = NULL;
 				GdkPixbuf* _tmp94_ = NULL;
 #line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10561,13 +10571,13 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_tmp94_ = 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 10559 "ImportPage.c"
+#line 10569 "ImportPage.c"
 			}
 #line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp95_ = import_source;
 #line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp95_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 10565 "ImportPage.c"
+#line 10575 "ImportPage.c"
 				ImportSource* _tmp96_ = NULL;
 				GdkPixbuf* _tmp97_ = NULL;
 				const gchar* _tmp98_ = NULL;
@@ -10585,13 +10595,13 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_tmp100_ = 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 10583 "ImportPage.c"
+#line 10593 "ImportPage.c"
 			}
 #line 1606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp101_ = associated;
 #line 1606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp101_ != NULL) {
-#line 10589 "ImportPage.c"
+#line 10599 "ImportPage.c"
 				{
 					PhotoMetadata* associated_metadata = NULL;
 					GPSpinIdleWrapper* _tmp102_ = NULL;
@@ -10639,7 +10649,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					associated_metadata = _tmp112_;
 #line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10637 "ImportPage.c"
+#line 10647 "ImportPage.c"
 						goto __catch70_g_error;
 					}
 #line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10654,7 +10664,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					photo_import_source_update (_tmp113_, _tmp114_, _tmp115_, _tmp116_, NULL);
 #line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_media_metadata_unref0 (associated_metadata);
-#line 10652 "ImportPage.c"
+#line 10662 "ImportPage.c"
 				}
 				goto __finally70;
 				__catch70_g_error:
@@ -10696,7 +10706,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_g_free0 (_tmp119_);
 #line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_error_free0 (err);
-#line 10694 "ImportPage.c"
+#line 10704 "ImportPage.c"
 				}
 				__finally70:
 #line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10727,7 +10737,7 @@ 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 10725 "ImportPage.c"
+#line 10735 "ImportPage.c"
 				}
 			}
 #line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10772,11 +10782,11 @@ 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 10770 "ImportPage.c"
+#line 10780 "ImportPage.c"
 		}
 #line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_import_source_list);
-#line 10774 "ImportPage.c"
+#line 10784 "ImportPage.c"
 	}
 }
 
@@ -10796,7 +10806,7 @@ 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 10794 "ImportPage.c"
+#line 10804 "ImportPage.c"
 		ViewCollection* _tmp2_ = NULL;
 		ViewCollection* _tmp3_ = NULL;
 		ImportPageHideImportedViewFilter* _tmp4_ = NULL;
@@ -10810,7 +10820,7 @@ 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 10808 "ImportPage.c"
+#line 10818 "ImportPage.c"
 	} else {
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
@@ -10825,7 +10835,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 10823 "ImportPage.c"
+#line 10833 "ImportPage.c"
 	}
 #line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = config_facade_get_instance ();
@@ -10839,7 +10849,7 @@ 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 10837 "ImportPage.c"
+#line 10847 "ImportPage.c"
 }
 
 
@@ -10864,7 +10874,7 @@ 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 10862 "ImportPage.c"
+#line 10872 "ImportPage.c"
 }
 
 
@@ -10889,7 +10899,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 10887 "ImportPage.c"
+#line 10897 "ImportPage.c"
 }
 
 
@@ -10898,28 +10908,28 @@ 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 10896 "ImportPage.c"
+#line 10906 "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 10903 "ImportPage.c"
+#line 10913 "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 10910 "ImportPage.c"
+#line 10920 "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 10917 "ImportPage.c"
+#line 10927 "ImportPage.c"
 }
 
 
@@ -10961,7 +10971,7 @@ 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 10959 "ImportPage.c"
+#line 10969 "ImportPage.c"
 		const gchar* _tmp5_ = NULL;
 		int _tmp6_ = 0;
 		gchar* _tmp7_ = NULL;
@@ -10988,7 +10998,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 		_g_free0 (_tmp8_);
 #line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 10986 "ImportPage.c"
+#line 10996 "ImportPage.c"
 	}
 #line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = self->priv->refreshed;
@@ -11001,14 +11011,14 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 #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);
 #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, batch_import_job_unref, _import_page_import_job_comparator_comparator, self);
+	_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);
 #line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	jobs = _tmp13_;
 #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, batch_import_job_unref, NULL, NULL, NULL);
+	_tmp14_ = 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 11006 "ImportPage.c"
+#line 11016 "ImportPage.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeIterable* _tmp15_ = NULL;
@@ -11021,7 +11031,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 		_object_it = _tmp16_;
 #line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		while (TRUE) {
-#line 11019 "ImportPage.c"
+#line 11029 "ImportPage.c"
 			GeeIterator* _tmp17_ = NULL;
 			gboolean _tmp18_ = FALSE;
 			DataObject* object = NULL;
@@ -11051,7 +11061,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 			if (!_tmp18_) {
 #line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 11049 "ImportPage.c"
+#line 11059 "ImportPage.c"
 			}
 #line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp19_ = _object_it;
@@ -11077,7 +11087,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 			_tmp26_ = import_preview_is_already_imported (_tmp25_);
 #line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp26_) {
-#line 11075 "ImportPage.c"
+#line 11085 "ImportPage.c"
 				ImportSource* _tmp27_ = NULL;
 				gchar* _tmp28_ = NULL;
 				gchar* _tmp29_ = NULL;
@@ -11130,7 +11140,7 @@ 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 11127 "ImportPage.c"
+#line 11137 "ImportPage.c"
 			}
 #line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp38_ = import_page_null_context;
@@ -11144,7 +11154,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 			_tmp42_ = import_file;
 #line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 11141 "ImportPage.c"
+#line 11151 "ImportPage.c"
 				ImportSource* _tmp43_ = NULL;
 				PhotoImportSource* _tmp44_ = NULL;
 				PhotoImportSource* _tmp45_ = NULL;
@@ -11158,15 +11168,15 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 				_tmp41_ = _tmp45_ != NULL;
 #line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp45_);
-#line 11155 "ImportPage.c"
+#line 11165 "ImportPage.c"
 			} else {
 #line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp41_ = FALSE;
-#line 11159 "ImportPage.c"
+#line 11169 "ImportPage.c"
 			}
 #line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp41_) {
-#line 11163 "ImportPage.c"
+#line 11173 "ImportPage.c"
 				ImportPageCameraImportJob* _tmp46_ = NULL;
 				GPContextWrapper* _tmp47_ = NULL;
 				ImportSource* _tmp48_ = NULL;
@@ -11194,7 +11204,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 				_batch_import_job_unref0 (_tmp52_);
 #line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp50_);
-#line 11191 "ImportPage.c"
+#line 11201 "ImportPage.c"
 			}
 #line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp53_ = jobs;
@@ -11210,11 +11220,11 @@ 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 11207 "ImportPage.c"
+#line 11217 "ImportPage.c"
 		}
 #line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_object_it);
-#line 11211 "ImportPage.c"
+#line 11221 "ImportPage.c"
 	}
 #line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp55_ = jobs;
@@ -11234,7 +11244,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 	_tmp61_ = _tmp60_;
 #line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp61_ > 0) {
-#line 11231 "ImportPage.c"
+#line 11241 "ImportPage.c"
 		ImportPage* _tmp62_ = NULL;
 		ImportPage* _tmp63_ = NULL;
 		BatchImport* batch_import = NULL;
@@ -11297,7 +11307,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 		_g_object_unref0 (_tmp74_);
 #line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (batch_import);
-#line 11294 "ImportPage.c"
+#line 11304 "ImportPage.c"
 	} else {
 		GeeArrayList* _tmp75_ = NULL;
 		gint _tmp76_ = 0;
@@ -11305,12 +11315,12 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 #line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp75_ = 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_COLLECTION, GeeCollection));
+		_tmp76_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp77_ = _tmp76_;
 #line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp77_ > 0) {
-#line 11307 "ImportPage.c"
+#line 11317 "ImportPage.c"
 			GeeArrayList* _tmp78_ = NULL;
 			ImportManifest* _tmp79_ = NULL;
 			ImportManifest* _tmp80_ = NULL;
@@ -11324,17 +11334,17 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 			import_page_import_reporter (self, _tmp80_);
 #line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_import_manifest_unref0 (_tmp80_);
-#line 11321 "ImportPage.c"
+#line 11331 "ImportPage.c"
 		}
 #line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_close_import (self);
-#line 11325 "ImportPage.c"
+#line 11335 "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 11331 "ImportPage.c"
+#line 11341 "ImportPage.c"
 }
 
 
@@ -11355,7 +11365,7 @@ 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 11352 "ImportPage.c"
+#line 11362 "ImportPage.c"
 	} else {
 		BatchImportResult* _tmp3_ = NULL;
 		ImportResult _tmp4_ = 0;
@@ -11365,13 +11375,13 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 		_tmp4_ = _tmp3_->result;
 #line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp4_ == IMPORT_RESULT_SUCCESS;
-#line 11362 "ImportPage.c"
+#line 11372 "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 11368 "ImportPage.c"
+#line 11378 "ImportPage.c"
 	}
 	{
 		BatchImportResult* _tmp5_ = NULL;
@@ -11384,7 +11394,7 @@ 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 11381 "ImportPage.c"
+#line 11391 "ImportPage.c"
 			goto __catch71_g_error;
 		}
 	}
@@ -11420,7 +11430,7 @@ 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 11417 "ImportPage.c"
+#line 11427 "ImportPage.c"
 	}
 	__finally71:
 #line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11431,7 +11441,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 11428 "ImportPage.c"
+#line 11438 "ImportPage.c"
 	}
 }
 
@@ -11439,7 +11449,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 11436 "ImportPage.c"
+#line 11446 "ImportPage.c"
 }
 
 
@@ -11448,7 +11458,7 @@ 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 11445 "ImportPage.c"
+#line 11455 "ImportPage.c"
 }
 
 
@@ -11502,7 +11512,7 @@ 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 11499 "ImportPage.c"
+#line 11509 "ImportPage.c"
 		gchar* photos_string = NULL;
 		ImportManifest* _tmp6_ = NULL;
 		GeeList* _tmp7_ = NULL;
@@ -11698,7 +11708,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 11695 "ImportPage.c"
+#line 11705 "ImportPage.c"
 		}
 #line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_import_ui_question_params_unref0 (question);
@@ -11712,7 +11722,7 @@ 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 11709 "ImportPage.c"
+#line 11719 "ImportPage.c"
 	} else {
 		ImportManifest* _tmp59_ = NULL;
 #line 1758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11723,7 +11733,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 		_g_object_unref0 (local_ref);
 #line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 11720 "ImportPage.c"
+#line 11730 "ImportPage.c"
 	}
 #line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp60_ = self->priv->import_sources;
@@ -11731,7 +11741,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 	_tmp61_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_DATA_COLLECTION, DataCollection));
 #line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	marker = _tmp61_;
-#line 11728 "ImportPage.c"
+#line 11738 "ImportPage.c"
 	{
 		GeeList* _batch_result_list = NULL;
 		ImportManifest* _tmp62_ = NULL;
@@ -11762,7 +11772,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 		_batch_result_index = -1;
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		while (TRUE) {
-#line 11759 "ImportPage.c"
+#line 11769 "ImportPage.c"
 			gint _tmp68_ = 0;
 			gint _tmp69_ = 0;
 			gint _tmp70_ = 0;
@@ -11790,7 +11800,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 			if (!(_tmp69_ < _tmp70_)) {
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 11787 "ImportPage.c"
+#line 11797 "ImportPage.c"
 			}
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp71_ = _batch_result_list;
@@ -11824,11 +11834,11 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 			_batch_import_job_unref0 (job);
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_batch_import_result_unref0 (batch_result);
-#line 11821 "ImportPage.c"
+#line 11831 "ImportPage.c"
 		}
 #line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_batch_result_list);
-#line 11825 "ImportPage.c"
+#line 11835 "ImportPage.c"
 	}
 #line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp81_ = app_window_get_instance ();
@@ -11866,7 +11876,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 	_tmp92_ = error_count;
 #line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp92_ > 0) {
-#line 11863 "ImportPage.c"
+#line 11873 "ImportPage.c"
 		gchar* error_string = NULL;
 		gint _tmp93_ = 0;
 		const gchar* _tmp94_ = NULL;
@@ -11889,7 +11899,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 		app_window_error_message (_tmp97_, NULL);
 #line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (error_string);
-#line 11886 "ImportPage.c"
+#line 11896 "ImportPage.c"
 	}
 #line 1782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp98_ = progress;
@@ -11905,7 +11915,7 @@ 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 11902 "ImportPage.c"
+#line 11912 "ImportPage.c"
 }
 
 
@@ -11933,7 +11943,7 @@ 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 11930 "ImportPage.c"
+#line 11940 "ImportPage.c"
 		int _tmp5_ = 0;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
@@ -11947,7 +11957,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 11944 "ImportPage.c"
+#line 11954 "ImportPage.c"
 	}
 #line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = self->priv->refreshed;
@@ -11955,7 +11965,7 @@ 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 11952 "ImportPage.c"
+#line 11962 "ImportPage.c"
 }
 
 
@@ -11973,14 +11983,14 @@ 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 11970 "ImportPage.c"
+#line 11980 "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 11977 "ImportPage.c"
+#line 11987 "ImportPage.c"
 }
 
 
@@ -11999,7 +12009,7 @@ 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 11996 "ImportPage.c"
+#line 12006 "ImportPage.c"
 }
 
 
@@ -12021,14 +12031,14 @@ 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 12018 "ImportPage.c"
+#line 12028 "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 12025 "ImportPage.c"
+#line 12035 "ImportPage.c"
 }
 
 
@@ -12049,7 +12059,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 12046 "ImportPage.c"
+#line 12056 "ImportPage.c"
 }
 
 
@@ -12061,15 +12071,15 @@ 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 = import_page_import_view_manager_real_create_view;
-#line 12059 "ImportPage.c"
+	((ViewManagerClass *) klass)->create_view = (DataView* (*)(ViewManager*, DataSource*)) import_page_import_view_manager_real_create_view;
+#line 12069 "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 12066 "ImportPage.c"
+#line 12076 "ImportPage.c"
 }
 
 
@@ -12081,7 +12091,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 12078 "ImportPage.c"
+#line 12088 "ImportPage.c"
 }
 
 
@@ -12100,7 +12110,7 @@ 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 12097 "ImportPage.c"
+#line 12107 "ImportPage.c"
 }
 
 
@@ -12196,7 +12206,7 @@ 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 12193 "ImportPage.c"
+#line 12203 "ImportPage.c"
 		ImportSource* _tmp17_ = NULL;
 		PhotoMetadata* _tmp18_ = NULL;
 #line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12207,13 +12217,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 12204 "ImportPage.c"
+#line 12214 "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 12210 "ImportPage.c"
+#line 12220 "ImportPage.c"
 	}
 #line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp19_ = _media_metadata_ref0 (_tmp15_);
@@ -12231,14 +12241,14 @@ 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 12228 "ImportPage.c"
+#line 12238 "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 12235 "ImportPage.c"
+#line 12245 "ImportPage.c"
 }
 
 
@@ -12253,7 +12263,7 @@ 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 12250 "ImportPage.c"
+#line 12260 "ImportPage.c"
 }
 
 
@@ -12272,7 +12282,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 12269 "ImportPage.c"
+#line 12279 "ImportPage.c"
 }
 
 
@@ -12287,23 +12297,23 @@ static time_t import_page_camera_import_job_real_get_exposure_time_override (Bat
 	_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 12284 "ImportPage.c"
+#line 12294 "ImportPage.c"
 		time_t _tmp2_ = 0;
 #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 12290 "ImportPage.c"
+#line 12300 "ImportPage.c"
 	} else {
 #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = (time_t) 0;
-#line 12294 "ImportPage.c"
+#line 12304 "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 12300 "ImportPage.c"
+#line 12310 "ImportPage.c"
 }
 
 
@@ -12322,7 +12332,7 @@ 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 12319 "ImportPage.c"
+#line 12329 "ImportPage.c"
 }
 
 
@@ -12341,7 +12351,7 @@ 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 12338 "ImportPage.c"
+#line 12348 "ImportPage.c"
 }
 
 
@@ -12360,7 +12370,7 @@ 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 12357 "ImportPage.c"
+#line 12367 "ImportPage.c"
 }
 
 
@@ -12379,7 +12389,7 @@ 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 12376 "ImportPage.c"
+#line 12386 "ImportPage.c"
 }
 
 
@@ -12399,7 +12409,7 @@ 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 12396 "ImportPage.c"
+#line 12406 "ImportPage.c"
 }
 
 
@@ -12417,7 +12427,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 12414 "ImportPage.c"
+#line 12424 "ImportPage.c"
 }
 
 
@@ -12430,7 +12440,7 @@ 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 12427 "ImportPage.c"
+#line 12437 "ImportPage.c"
 }
 
 
@@ -12456,21 +12466,21 @@ 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 12453 "ImportPage.c"
+#line 12463 "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 12459 "ImportPage.c"
+#line 12469 "ImportPage.c"
 	} else {
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_vala_file);
-#line 12463 "ImportPage.c"
+#line 12473 "ImportPage.c"
 	}
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12467 "ImportPage.c"
+#line 12477 "ImportPage.c"
 }
 
 
@@ -12480,11 +12490,11 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 	gboolean _vala_copy_to_library = FALSE;
 	gboolean result = FALSE;
 	GFile* dest_file = NULL;
-	GFile* _tmp12_ = NULL;
-	GFile* _tmp16_ = NULL;
-	ImportPageCameraImportJob* _tmp24_ = NULL;
-	GFile* _tmp55_ = NULL;
-	GFile* _tmp56_ = NULL;
+	GFile* _tmp13_ = NULL;
+	GFile* _tmp17_ = NULL;
+	ImportPageCameraImportJob* _tmp26_ = NULL;
+	GFile* _tmp59_ = NULL;
+	GFile* _tmp60_ = NULL;
 	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);
@@ -12496,7 +12506,7 @@ 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 12493 "ImportPage.c"
+#line 12503 "ImportPage.c"
 	{
 		gboolean collision = FALSE;
 		GFile* _tmp0_ = NULL;
@@ -12520,7 +12530,7 @@ 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 12517 "ImportPage.c"
+#line 12527 "ImportPage.c"
 			goto __catch72_g_error;
 		}
 #line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12533,7 +12543,7 @@ 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 12530 "ImportPage.c"
+#line 12540 "ImportPage.c"
 	}
 	goto __finally72;
 	__catch72_g_error:
@@ -12564,37 +12574,39 @@ 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 12561 "ImportPage.c"
+#line 12571 "ImportPage.c"
 	}
 	__finally72:
 #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 12576 "ImportPage.c"
+		gboolean _tmp12_ = FALSE;
 #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_propagate_error (error, _inner_error_);
 #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (dest_file);
 #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		return FALSE;
-#line 12572 "ImportPage.c"
+		return _tmp12_;
+#line 12584 "ImportPage.c"
 	}
 #line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp12_ = dest_file;
+	_tmp13_ = dest_file;
 #line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp12_ == NULL) {
-#line 12578 "ImportPage.c"
-		ImportSource* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
+	if (_tmp13_ == NULL) {
+#line 12590 "ImportPage.c"
+		ImportSource* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
+		gchar* _tmp16_ = NULL;
 #line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp13_ = self->priv->import_file;
+		_tmp14_ = self->priv->import_file;
 #line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp14_ = import_source_get_filename (_tmp13_);
+		_tmp15_ = import_source_get_filename (_tmp14_);
 #line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp15_ = _tmp14_;
+		_tmp16_ = _tmp15_;
 #line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_message ("ImportPage.vala:573: Unable to generate local file for %s", _tmp15_);
+		g_message ("ImportPage.vala:573: Unable to generate local file for %s", _tmp16_);
 #line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_free0 (_tmp15_);
+		_g_free0 (_tmp16_);
 #line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
 #line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12603,185 +12615,189 @@ 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 12600 "ImportPage.c"
+#line 12612 "ImportPage.c"
 		} else {
 #line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (_vala_file_to_import);
-#line 12604 "ImportPage.c"
+#line 12616 "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 12610 "ImportPage.c"
+#line 12622 "ImportPage.c"
 		}
 #line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 12614 "ImportPage.c"
+#line 12626 "ImportPage.c"
 	}
 #line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp16_ = dest_file;
+	_tmp17_ = dest_file;
 #line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	library_monitor_blacklist_file (_tmp16_, "CameraImportJob.prepare");
-#line 12620 "ImportPage.c"
+	library_monitor_blacklist_file (_tmp17_, "CameraImportJob.prepare");
+#line 12632 "ImportPage.c"
 	{
-		GPContextWrapper* _tmp17_ = NULL;
-		GPContext* _tmp18_ = NULL;
-		Camera* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
+		GPContextWrapper* _tmp18_ = NULL;
+		GPContext* _tmp19_ = NULL;
+		Camera* _tmp20_ = NULL;
 		const gchar* _tmp21_ = NULL;
-		GFile* _tmp22_ = NULL;
+		const gchar* _tmp22_ = NULL;
+		GFile* _tmp23_ = NULL;
 #line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp17_ = self->priv->context;
+		_tmp18_ = self->priv->context;
 #line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp18_ = _tmp17_->context;
+		_tmp19_ = _tmp18_->context;
 #line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp19_ = self->priv->camera;
+		_tmp20_ = self->priv->camera;
 #line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp20_ = self->priv->fulldir;
+		_tmp21_ = self->priv->fulldir;
 #line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp21_ = self->priv->filename;
+		_tmp22_ = self->priv->filename;
 #line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp22_ = dest_file;
+		_tmp23_ = dest_file;
 #line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gp_save_image (_tmp18_, _tmp19_, _tmp20_, _tmp21_, _tmp22_, &_inner_error_);
+		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 12644 "ImportPage.c"
+#line 12656 "ImportPage.c"
 			goto __finally73;
 		}
 	}
 	__finally73:
 	{
-		GFile* _tmp23_ = NULL;
+		GFile* _tmp24_ = NULL;
 #line 584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp23_ = dest_file;
+		_tmp24_ = dest_file;
 #line 584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		library_monitor_unblacklist_file (_tmp23_);
-#line 12655 "ImportPage.c"
+		library_monitor_unblacklist_file (_tmp24_);
+#line 12667 "ImportPage.c"
 	}
 #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 12671 "ImportPage.c"
+		gboolean _tmp25_ = FALSE;
 #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_propagate_error (error, _inner_error_);
 #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (dest_file);
 #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		return FALSE;
-#line 12665 "ImportPage.c"
+		return _tmp25_;
+#line 12679 "ImportPage.c"
 	}
 #line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp24_ = self->priv->associated;
+	_tmp26_ = self->priv->associated;
 #line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp24_ != NULL) {
-#line 12671 "ImportPage.c"
-		BackingPhotoRow* _tmp39_ = NULL;
-		GFile* assoc_dest = NULL;
+	if (_tmp26_ != NULL) {
+#line 12685 "ImportPage.c"
 		BackingPhotoRow* _tmp42_ = NULL;
-		const gchar* _tmp43_ = NULL;
-		GFile* _tmp44_ = NULL;
-		GFile* _tmp45_ = NULL;
+		GFile* assoc_dest = NULL;
+		BackingPhotoRow* _tmp45_ = NULL;
+		const gchar* _tmp46_ = NULL;
+		GFile* _tmp47_ = NULL;
+		GFile* _tmp48_ = NULL;
 		{
-			BackingPhotoRow* _tmp25_ = NULL;
-			GFile* _tmp26_ = NULL;
-			gchar* _tmp27_ = NULL;
-			gchar* _tmp28_ = NULL;
-			ImportPageCameraImportJob* _tmp29_ = NULL;
+			BackingPhotoRow* _tmp27_ = NULL;
+			GFile* _tmp28_ = NULL;
+			gchar* _tmp29_ = NULL;
 			gchar* _tmp30_ = NULL;
-			gchar* _tmp31_ = NULL;
-			BackingPhotoRow* _tmp32_ = NULL;
-			BackingPhotoRow* _tmp33_ = NULL;
+			ImportPageCameraImportJob* _tmp31_ = NULL;
+			gchar* _tmp32_ = NULL;
+			gchar* _tmp33_ = NULL;
 			BackingPhotoRow* _tmp34_ = NULL;
+			BackingPhotoRow* _tmp35_ = NULL;
+			BackingPhotoRow* _tmp36_ = NULL;
 #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp26_ = dest_file;
+			_tmp28_ = dest_file;
 #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp27_ = g_file_get_path (_tmp26_);
+			_tmp29_ = g_file_get_path (_tmp28_);
 #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp28_ = _tmp27_;
+			_tmp30_ = _tmp29_;
 #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp29_ = self->priv->associated;
+			_tmp31_ = self->priv->associated;
 #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp30_ = batch_import_job_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_BATCH_IMPORT_JOB, BatchImportJob));
+			_tmp32_ = batch_import_job_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_BATCH_IMPORT_JOB, BatchImportJob));
 #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp31_ = _tmp30_;
+			_tmp33_ = _tmp32_;
 #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp32_ = raw_developer_create_backing_row_for_development (RAW_DEVELOPER_CAMERA, _tmp28_, _tmp31_, &_inner_error_);
+			_tmp34_ = raw_developer_create_backing_row_for_development (RAW_DEVELOPER_CAMERA, _tmp30_, _tmp33_, &_inner_error_);
 #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp33_ = _tmp32_;
+			_tmp35_ = _tmp34_;
 #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_g_free0 (_tmp31_);
+			_g_free0 (_tmp33_);
 #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_g_free0 (_tmp28_);
+			_g_free0 (_tmp30_);
 #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp25_ = _tmp33_;
+			_tmp27_ = _tmp35_;
 #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12713 "ImportPage.c"
+#line 12727 "ImportPage.c"
 				goto __catch74_g_error;
 			}
 #line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp34_ = _tmp25_;
+			_tmp36_ = _tmp27_;
 #line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp25_ = NULL;
+			_tmp27_ = NULL;
 #line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_backing_photo_row_unref0 (self->priv->associated_file);
 #line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			self->priv->associated_file = _tmp34_;
+			self->priv->associated_file = _tmp36_;
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_backing_photo_row_unref0 (_tmp25_);
-#line 12726 "ImportPage.c"
+			_backing_photo_row_unref0 (_tmp27_);
+#line 12740 "ImportPage.c"
 		}
 		goto __finally74;
 		__catch74_g_error:
 		{
 			GError* err = NULL;
-			ImportPageCameraImportJob* _tmp35_ = NULL;
-			const gchar* _tmp36_ = NULL;
-			GError* _tmp37_ = NULL;
+			ImportPageCameraImportJob* _tmp37_ = NULL;
 			const gchar* _tmp38_ = NULL;
+			GError* _tmp39_ = NULL;
+			const gchar* _tmp40_ = NULL;
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			err = _inner_error_;
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_inner_error_ = NULL;
 #line 594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp35_ = self->priv->associated;
+			_tmp37_ = self->priv->associated;
 #line 594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp36_ = _tmp35_->priv->filename;
+			_tmp38_ = _tmp37_->priv->filename;
 #line 594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp37_ = err;
+			_tmp39_ = err;
 #line 594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp38_ = _tmp37_->message;
+			_tmp40_ = _tmp39_->message;
 #line 594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			g_warning ("ImportPage.vala:594: Unable to generate backing associated file for %s" \
-": %s", _tmp36_, _tmp38_);
+": %s", _tmp38_, _tmp40_);
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_error_free0 (err);
-#line 12752 "ImportPage.c"
+#line 12766 "ImportPage.c"
 		}
 		__finally74:
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 12771 "ImportPage.c"
+			gboolean _tmp41_ = FALSE;
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			g_propagate_error (error, _inner_error_);
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (dest_file);
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			return FALSE;
-#line 12763 "ImportPage.c"
+			return _tmp41_;
+#line 12779 "ImportPage.c"
 		}
 #line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp39_ = self->priv->associated_file;
+		_tmp42_ = self->priv->associated_file;
 #line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		if (_tmp39_ == NULL) {
-#line 12769 "ImportPage.c"
-			ImportPageCameraImportJob* _tmp40_ = NULL;
-			const gchar* _tmp41_ = NULL;
+		if (_tmp42_ == NULL) {
+#line 12785 "ImportPage.c"
+			ImportPageCameraImportJob* _tmp43_ = NULL;
+			const gchar* _tmp44_ = NULL;
 #line 599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp40_ = self->priv->associated;
+			_tmp43_ = self->priv->associated;
 #line 599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp41_ = _tmp40_->priv->filename;
+			_tmp44_ = _tmp43_->priv->filename;
 #line 599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			g_message ("ImportPage.vala:599: Unable to generate backing associated file for %s", _tmp41_);
+			g_message ("ImportPage.vala:599: Unable to generate backing associated file for %s", _tmp44_);
 #line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = FALSE;
 #line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12790,79 +12806,81 @@ 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 12786 "ImportPage.c"
+#line 12802 "ImportPage.c"
 			} else {
 #line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_vala_file_to_import);
-#line 12790 "ImportPage.c"
+#line 12806 "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 12796 "ImportPage.c"
+#line 12812 "ImportPage.c"
 			}
 #line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 12800 "ImportPage.c"
+#line 12816 "ImportPage.c"
 		}
 #line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp42_ = self->priv->associated_file;
+		_tmp45_ = self->priv->associated_file;
 #line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp43_ = _tmp42_->filepath;
+		_tmp46_ = _tmp45_->filepath;
 #line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp44_ = g_file_new_for_path (_tmp43_);
+		_tmp47_ = g_file_new_for_path (_tmp46_);
 #line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		assoc_dest = _tmp44_;
+		assoc_dest = _tmp47_;
 #line 604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp45_ = assoc_dest;
+		_tmp48_ = assoc_dest;
 #line 604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		library_monitor_blacklist_file (_tmp45_, "CameraImportJob.prepare");
-#line 12814 "ImportPage.c"
+		library_monitor_blacklist_file (_tmp48_, "CameraImportJob.prepare");
+#line 12830 "ImportPage.c"
 		{
-			GPContextWrapper* _tmp46_ = NULL;
-			GPContext* _tmp47_ = NULL;
-			Camera* _tmp48_ = NULL;
-			ImportPageCameraImportJob* _tmp49_ = NULL;
-			const gchar* _tmp50_ = NULL;
-			ImportPageCameraImportJob* _tmp51_ = NULL;
-			const gchar* _tmp52_ = NULL;
-			GFile* _tmp53_ = NULL;
+			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;
 #line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp46_ = self->priv->context;
+			_tmp49_ = self->priv->context;
 #line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp47_ = _tmp46_->context;
+			_tmp50_ = _tmp49_->context;
 #line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp48_ = self->priv->camera;
+			_tmp51_ = self->priv->camera;
 #line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp49_ = self->priv->associated;
+			_tmp52_ = self->priv->associated;
 #line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp50_ = _tmp49_->priv->fulldir;
+			_tmp53_ = _tmp52_->priv->fulldir;
 #line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp51_ = self->priv->associated;
+			_tmp54_ = self->priv->associated;
 #line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp52_ = _tmp51_->priv->filename;
+			_tmp55_ = _tmp54_->priv->filename;
 #line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp53_ = assoc_dest;
+			_tmp56_ = assoc_dest;
 #line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			gp_save_image (_tmp47_, _tmp48_, _tmp50_, _tmp52_, _tmp53_, &_inner_error_);
+			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 12844 "ImportPage.c"
+#line 12860 "ImportPage.c"
 				goto __finally75;
 			}
 		}
 		__finally75:
 		{
-			GFile* _tmp54_ = NULL;
+			GFile* _tmp57_ = NULL;
 #line 609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp54_ = assoc_dest;
+			_tmp57_ = assoc_dest;
 #line 609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			library_monitor_unblacklist_file (_tmp54_);
-#line 12855 "ImportPage.c"
+			library_monitor_unblacklist_file (_tmp57_);
+#line 12871 "ImportPage.c"
 		}
 #line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 12875 "ImportPage.c"
+			gboolean _tmp58_ = FALSE;
 #line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			g_propagate_error (error, _inner_error_);
 #line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12870,21 +12888,21 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 #line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (dest_file);
 #line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			return FALSE;
-#line 12867 "ImportPage.c"
+			return _tmp58_;
+#line 12885 "ImportPage.c"
 		}
 #line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (assoc_dest);
-#line 12871 "ImportPage.c"
+#line 12889 "ImportPage.c"
 	}
 #line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp55_ = dest_file;
+	_tmp59_ = dest_file;
 #line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp56_ = _g_object_ref0 (_tmp55_);
+	_tmp60_ = _g_object_ref0 (_tmp59_);
 #line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_vala_file_to_import);
 #line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_vala_file_to_import = _tmp56_;
+	_vala_file_to_import = _tmp60_;
 #line 614 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_vala_copy_to_library = FALSE;
 #line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12895,21 +12913,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 12891 "ImportPage.c"
+#line 12909 "ImportPage.c"
 	} else {
 #line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_vala_file_to_import);
-#line 12895 "ImportPage.c"
+#line 12913 "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 12901 "ImportPage.c"
+#line 12919 "ImportPage.c"
 	}
 #line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12905 "ImportPage.c"
+#line 12923 "ImportPage.c"
 }
 
 
@@ -12931,7 +12949,7 @@ 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 12927 "ImportPage.c"
+#line 12945 "ImportPage.c"
 		Photo* photo = NULL;
 		MediaSource* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
@@ -12946,13 +12964,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 12942 "ImportPage.c"
+#line 12960 "ImportPage.c"
 			Photo* _tmp4_ = NULL;
 			BackingPhotoRow* _tmp5_ = NULL;
-			Photo* _tmp6_ = NULL;
-			ConfigFacade* _tmp7_ = NULL;
+			Photo* _tmp7_ = NULL;
 			ConfigFacade* _tmp8_ = NULL;
-			RawDeveloper _tmp9_ = 0;
+			ConfigFacade* _tmp9_ = NULL;
+			RawDeveloper _tmp10_ = 0;
 #line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp4_ = photo;
 #line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12961,39 +12979,41 @@ 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"
+				gboolean _tmp6_ = FALSE;
 #line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				g_propagate_error (error, _inner_error_);
 #line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (photo);
 #line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				return FALSE;
-#line 12963 "ImportPage.c"
+				return _tmp6_;
+#line 12983 "ImportPage.c"
 			}
 #line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			ret = TRUE;
 #line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp6_ = photo;
+			_tmp7_ = photo;
 #line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp7_ = config_facade_get_instance ();
+			_tmp8_ = config_facade_get_instance ();
 #line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp8_ = _tmp7_;
+			_tmp9_ = _tmp8_;
 #line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp9_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+			_tmp10_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			photo_set_raw_developer (_tmp6_, _tmp9_);
+			photo_set_raw_developer (_tmp7_, _tmp10_);
 #line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_g_object_unref0 (_tmp8_);
-#line 12979 "ImportPage.c"
+			_g_object_unref0 (_tmp9_);
+#line 12999 "ImportPage.c"
 		}
 #line 621 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (photo);
-#line 12983 "ImportPage.c"
+#line 13003 "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 12989 "ImportPage.c"
+#line 13009 "ImportPage.c"
 }
 
 
@@ -13005,28 +13025,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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = import_page_camera_import_job_real_complete;
-#line 13022 "ImportPage.c"
+	((BatchImportJobClass *) klass)->complete = (gboolean (*)(BatchImportJob*, MediaSource*, BatchImportRoll*, GError**)) import_page_camera_import_job_real_complete;
+#line 13042 "ImportPage.c"
 }
 
 
@@ -13037,7 +13057,7 @@ 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 13033 "ImportPage.c"
+#line 13053 "ImportPage.c"
 }
 
 
@@ -13065,7 +13085,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 13061 "ImportPage.c"
+#line 13081 "ImportPage.c"
 }
 
 
@@ -13090,7 +13110,7 @@ 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 13086 "ImportPage.c"
+#line 13106 "ImportPage.c"
 }
 
 
@@ -13110,7 +13130,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 13106 "ImportPage.c"
+#line 13126 "ImportPage.c"
 }
 
 
@@ -13137,27 +13157,27 @@ 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 13133 "ImportPage.c"
+#line 13153 "ImportPage.c"
 		gboolean _tmp4_ = FALSE;
 #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 13139 "ImportPage.c"
+#line 13159 "ImportPage.c"
 	} else {
 #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = FALSE;
-#line 13143 "ImportPage.c"
+#line 13163 "ImportPage.c"
 	}
 #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp2_) {
-#line 13147 "ImportPage.c"
+#line 13167 "ImportPage.c"
 		ImportSource* _tmp5_ = NULL;
 #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 13153 "ImportPage.c"
+#line 13173 "ImportPage.c"
 			gboolean _tmp6_ = FALSE;
 			gboolean _tmp7_ = FALSE;
 #line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13172,7 +13192,7 @@ 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 13168 "ImportPage.c"
+#line 13188 "ImportPage.c"
 			}
 		} else {
 			ImportSource* _tmp8_ = NULL;
@@ -13180,7 +13200,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 			_tmp8_ = source;
 #line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 13176 "ImportPage.c"
+#line 13196 "ImportPage.c"
 				PhotoImportSource* photo = NULL;
 				ImportSource* _tmp9_ = NULL;
 				PhotoImportSource* _tmp10_ = NULL;
@@ -13198,7 +13218,7 @@ 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 13194 "ImportPage.c"
+#line 13214 "ImportPage.c"
 					PhotoImportSource* _tmp13_ = NULL;
 					PhotoImportSource* _tmp14_ = NULL;
 					PhotoImportSource* _tmp15_ = NULL;
@@ -13215,7 +13235,7 @@ 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 13211 "ImportPage.c"
+#line 13231 "ImportPage.c"
 						gboolean _tmp17_ = FALSE;
 						gboolean _tmp18_ = FALSE;
 						gboolean _tmp19_ = FALSE;
@@ -13225,7 +13245,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 						_tmp19_ = _tmp18_;
 #line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (!_tmp19_) {
-#line 13221 "ImportPage.c"
+#line 13241 "ImportPage.c"
 							gboolean _tmp20_ = FALSE;
 							gboolean _tmp21_ = FALSE;
 #line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13234,11 +13254,11 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 							_tmp21_ = _tmp20_;
 #line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp17_ = !_tmp21_;
-#line 13230 "ImportPage.c"
+#line 13250 "ImportPage.c"
 						} else {
 #line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp17_ = FALSE;
-#line 13234 "ImportPage.c"
+#line 13254 "ImportPage.c"
 						}
 #line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (_tmp17_) {
@@ -13250,7 +13270,7 @@ 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 13246 "ImportPage.c"
+#line 13266 "ImportPage.c"
 						}
 					} else {
 						gboolean _tmp22_ = FALSE;
@@ -13269,7 +13289,7 @@ 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 13265 "ImportPage.c"
+#line 13285 "ImportPage.c"
 						}
 					}
 				} else {
@@ -13289,12 +13309,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 13285 "ImportPage.c"
+#line 13305 "ImportPage.c"
 					}
 				}
 #line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (photo);
-#line 13290 "ImportPage.c"
+#line 13310 "ImportPage.c"
 			}
 		}
 	}
@@ -13302,7 +13322,7 @@ 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 13298 "ImportPage.c"
+#line 13318 "ImportPage.c"
 		const gchar* keywords = NULL;
 		ImportSource* _tmp27_ = NULL;
 		const gchar* _tmp28_ = NULL;
@@ -13328,11 +13348,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 13324 "ImportPage.c"
+#line 13344 "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 13328 "ImportPage.c"
+#line 13348 "ImportPage.c"
 		{
 			gchar** word_collection = NULL;
 			gint word_collection_length1 = 0;
@@ -13344,11 +13364,11 @@ 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 13340 "ImportPage.c"
+#line 13360 "ImportPage.c"
 				const gchar* word = NULL;
 #line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				word = word_collection[word_it];
-#line 13344 "ImportPage.c"
+#line 13364 "ImportPage.c"
 				{
 					const gchar* _tmp33_ = NULL;
 					const gchar* _tmp34_ = NULL;
@@ -13367,7 +13387,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 13363 "ImportPage.c"
+#line 13383 "ImportPage.c"
 					}
 				}
 			}
@@ -13379,7 +13399,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 13375 "ImportPage.c"
+#line 13395 "ImportPage.c"
 }
 
 
@@ -13389,14 +13409,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 13385 "ImportPage.c"
+#line 13405 "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 13392 "ImportPage.c"
+#line 13412 "ImportPage.c"
 }
 
 
@@ -13404,10 +13424,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 = 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 = import_page_import_page_search_view_filter_real_predicate;
-#line 13403 "ImportPage.c"
+	((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) import_page_import_page_search_view_filter_real_predicate;
+#line 13423 "ImportPage.c"
 }
 
 
@@ -13444,7 +13464,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 13440 "ImportPage.c"
+#line 13460 "ImportPage.c"
 }
 
 
@@ -13454,14 +13474,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 13450 "ImportPage.c"
+#line 13470 "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 13457 "ImportPage.c"
+#line 13477 "ImportPage.c"
 }
 
 
@@ -13469,8 +13489,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 = import_page_hide_imported_view_filter_real_predicate;
-#line 13466 "ImportPage.c"
+	((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) import_page_hide_imported_view_filter_real_predicate;
+#line 13486 "ImportPage.c"
 }
 
 
@@ -13496,32 +13516,32 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 13517 "ImportPage.c"
+#line 13537 "ImportPage.c"
 }
 
 
@@ -13566,7 +13586,7 @@ 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 13562 "ImportPage.c"
+#line 13582 "ImportPage.c"
 }
 
 
@@ -13620,7 +13640,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 13616 "ImportPage.c"
+#line 13636 "ImportPage.c"
 }
 
 
diff --git a/src/config/Config.c b/src/config/Config.c
index a4faeb0..8c5fc92 100644
--- a/src/config/Config.c
+++ b/src/config/Config.c
@@ -1,4 +1,4 @@
-/* Config.c generated by valac 0.34.4, the Vala compiler
+/* Config.c generated by valac 0.34.7, the Vala compiler
  * generated from Config.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/config/ConfigurationInterfaces.c b/src/config/ConfigurationInterfaces.c
index a44fd05..3b225bb 100644
--- a/src/config/ConfigurationInterfaces.c
+++ b/src/config/ConfigurationInterfaces.c
@@ -1,4 +1,4 @@
-/* ConfigurationInterfaces.c generated by valac 0.34.4, the Vala compiler
+/* ConfigurationInterfaces.c generated by valac 0.34.7, the Vala compiler
  * generated from ConfigurationInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2093,6 +2093,7 @@ void configuration_facade_on_configuration_error (ConfigurationFacade* self, GEr
 
 static gboolean configuration_facade_real_get_auto_import_from_library (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -2114,9 +2115,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2115 "ConfigurationInterfaces.c"
+#line 2118 "ConfigurationInterfaces.c"
 				goto __catch82_configuration_error;
 			}
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2124,35 +2127,35 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 2124 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 2127 "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 2130 "ConfigurationInterfaces.c"
+#line 2133 "ConfigurationInterfaces.c"
 	}
 	goto __finally82;
 	__catch82_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
 #line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2151 "ConfigurationInterfaces.c"
+#line 2154 "ConfigurationInterfaces.c"
 	}
 	__finally82:
 #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2160,8 +2163,8 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur
 #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 FALSE;
-#line 2160 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 2163 "ConfigurationInterfaces.c"
 }
 
 
@@ -2170,7 +2173,7 @@ 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 2169 "ConfigurationInterfaces.c"
+#line 2172 "ConfigurationInterfaces.c"
 }
 
 
@@ -2194,7 +2197,7 @@ 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 2193 "ConfigurationInterfaces.c"
+#line 2196 "ConfigurationInterfaces.c"
 				goto __catch83_configuration_error;
 			}
 #line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2203,7 +2206,7 @@ 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 2202 "ConfigurationInterfaces.c"
+#line 2205 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally83;
@@ -2223,7 +2226,7 @@ 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 2222 "ConfigurationInterfaces.c"
+#line 2225 "ConfigurationInterfaces.c"
 	}
 	__finally83:
 #line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2234,7 +2237,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 2233 "ConfigurationInterfaces.c"
+#line 2236 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -2244,7 +2247,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 2243 "ConfigurationInterfaces.c"
+#line 2246 "ConfigurationInterfaces.c"
 }
 
 
@@ -2274,7 +2277,7 @@ 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 2273 "ConfigurationInterfaces.c"
+#line 2276 "ConfigurationInterfaces.c"
 				goto __catch84_configuration_error;
 			}
 #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2283,7 +2286,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 2282 "ConfigurationInterfaces.c"
+#line 2285 "ConfigurationInterfaces.c"
 		}
 #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -2295,7 +2298,7 @@ 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 2294 "ConfigurationInterfaces.c"
+#line 2297 "ConfigurationInterfaces.c"
 	}
 	goto __finally84;
 	__catch84_configuration_error:
@@ -2319,7 +2322,7 @@ 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 2318 "ConfigurationInterfaces.c"
+#line 2321 "ConfigurationInterfaces.c"
 	}
 	__finally84:
 #line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2328,7 +2331,7 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade*
 	g_clear_error (&_inner_error_);
 #line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 2327 "ConfigurationInterfaces.c"
+#line 2330 "ConfigurationInterfaces.c"
 }
 
 
@@ -2337,7 +2340,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 2336 "ConfigurationInterfaces.c"
+#line 2339 "ConfigurationInterfaces.c"
 }
 
 
@@ -2345,7 +2348,7 @@ 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 2344 "ConfigurationInterfaces.c"
+#line 2347 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -2364,7 +2367,7 @@ 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 2363 "ConfigurationInterfaces.c"
+#line 2366 "ConfigurationInterfaces.c"
 				goto __catch85_configuration_error;
 			}
 #line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2373,7 +2376,7 @@ 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 2372 "ConfigurationInterfaces.c"
+#line 2375 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally85;
@@ -2393,7 +2396,7 @@ 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 2392 "ConfigurationInterfaces.c"
+#line 2395 "ConfigurationInterfaces.c"
 	}
 	__finally85:
 #line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2404,7 +2407,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 2403 "ConfigurationInterfaces.c"
+#line 2406 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -2414,12 +2417,13 @@ 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 2413 "ConfigurationInterfaces.c"
+#line 2416 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_commit_metadata_to_masters (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -2441,9 +2445,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2442 "ConfigurationInterfaces.c"
+#line 2448 "ConfigurationInterfaces.c"
 				goto __catch86_configuration_error;
 			}
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2451,35 +2457,35 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 2451 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 2457 "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 2457 "ConfigurationInterfaces.c"
+#line 2463 "ConfigurationInterfaces.c"
 	}
 	goto __finally86;
 	__catch86_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
 #line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2478 "ConfigurationInterfaces.c"
+#line 2484 "ConfigurationInterfaces.c"
 	}
 	__finally86:
 #line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2487,8 +2493,8 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config
 #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 FALSE;
-#line 2487 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 2493 "ConfigurationInterfaces.c"
 }
 
 
@@ -2497,7 +2503,7 @@ 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 2496 "ConfigurationInterfaces.c"
+#line 2502 "ConfigurationInterfaces.c"
 }
 
 
@@ -2521,7 +2527,7 @@ 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 2520 "ConfigurationInterfaces.c"
+#line 2526 "ConfigurationInterfaces.c"
 				goto __catch87_configuration_error;
 			}
 #line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2530,7 +2536,7 @@ 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 2529 "ConfigurationInterfaces.c"
+#line 2535 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally87;
@@ -2550,7 +2556,7 @@ 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 2549 "ConfigurationInterfaces.c"
+#line 2555 "ConfigurationInterfaces.c"
 	}
 	__finally87:
 #line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2561,7 +2567,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 2560 "ConfigurationInterfaces.c"
+#line 2566 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -2571,7 +2577,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 2570 "ConfigurationInterfaces.c"
+#line 2576 "ConfigurationInterfaces.c"
 }
 
 
@@ -2601,7 +2607,7 @@ 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 2600 "ConfigurationInterfaces.c"
+#line 2606 "ConfigurationInterfaces.c"
 				goto __catch88_configuration_error;
 			}
 #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2610,7 +2616,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 2609 "ConfigurationInterfaces.c"
+#line 2615 "ConfigurationInterfaces.c"
 		}
 #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -2622,7 +2628,7 @@ 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 2621 "ConfigurationInterfaces.c"
+#line 2627 "ConfigurationInterfaces.c"
 	}
 	goto __finally88;
 	__catch88_configuration_error:
@@ -2646,7 +2652,7 @@ 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 2645 "ConfigurationInterfaces.c"
+#line 2651 "ConfigurationInterfaces.c"
 	}
 	__finally88:
 #line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2655,7 +2661,7 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac
 	g_clear_error (&_inner_error_);
 #line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 2654 "ConfigurationInterfaces.c"
+#line 2660 "ConfigurationInterfaces.c"
 }
 
 
@@ -2664,7 +2670,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 2663 "ConfigurationInterfaces.c"
+#line 2669 "ConfigurationInterfaces.c"
 }
 
 
@@ -2672,7 +2678,7 @@ 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 2671 "ConfigurationInterfaces.c"
+#line 2677 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -2693,7 +2699,7 @@ 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 2692 "ConfigurationInterfaces.c"
+#line 2698 "ConfigurationInterfaces.c"
 				goto __catch89_configuration_error;
 			}
 #line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2702,7 +2708,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 2701 "ConfigurationInterfaces.c"
+#line 2707 "ConfigurationInterfaces.c"
 		}
 #line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -2716,7 +2722,7 @@ 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 2715 "ConfigurationInterfaces.c"
+#line 2721 "ConfigurationInterfaces.c"
 				goto __catch89_configuration_error;
 			}
 #line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2725,7 +2731,7 @@ 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 2724 "ConfigurationInterfaces.c"
+#line 2730 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally89;
@@ -2743,7 +2749,7 @@ 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 2742 "ConfigurationInterfaces.c"
+#line 2748 "ConfigurationInterfaces.c"
 	}
 	__finally89:
 #line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2754,7 +2760,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 2753 "ConfigurationInterfaces.c"
+#line 2759 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -2764,7 +2770,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 2763 "ConfigurationInterfaces.c"
+#line 2769 "ConfigurationInterfaces.c"
 }
 
 
@@ -2794,7 +2800,7 @@ 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 2793 "ConfigurationInterfaces.c"
+#line 2799 "ConfigurationInterfaces.c"
 				goto __catch90_configuration_error;
 			}
 #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2803,7 +2809,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 2802 "ConfigurationInterfaces.c"
+#line 2808 "ConfigurationInterfaces.c"
 		}
 #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -2815,7 +2821,7 @@ 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 2814 "ConfigurationInterfaces.c"
+#line 2820 "ConfigurationInterfaces.c"
 	}
 	goto __finally90;
 	__catch90_configuration_error:
@@ -2839,7 +2845,7 @@ 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 2838 "ConfigurationInterfaces.c"
+#line 2844 "ConfigurationInterfaces.c"
 	}
 	__finally90:
 #line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2848,7 +2854,7 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se
 	g_clear_error (&_inner_error_);
 #line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 2847 "ConfigurationInterfaces.c"
+#line 2853 "ConfigurationInterfaces.c"
 }
 
 
@@ -2857,7 +2863,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 2856 "ConfigurationInterfaces.c"
+#line 2862 "ConfigurationInterfaces.c"
 }
 
 
@@ -2865,7 +2871,7 @@ 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 2864 "ConfigurationInterfaces.c"
+#line 2870 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -2886,7 +2892,7 @@ 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 2885 "ConfigurationInterfaces.c"
+#line 2891 "ConfigurationInterfaces.c"
 				goto __catch91_configuration_error;
 			}
 #line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2895,7 +2901,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 2894 "ConfigurationInterfaces.c"
+#line 2900 "ConfigurationInterfaces.c"
 		}
 #line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -2909,7 +2915,7 @@ 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 2908 "ConfigurationInterfaces.c"
+#line 2914 "ConfigurationInterfaces.c"
 				goto __catch91_configuration_error;
 			}
 #line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2918,7 +2924,7 @@ 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 2917 "ConfigurationInterfaces.c"
+#line 2923 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally91;
@@ -2936,7 +2942,7 @@ 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 2935 "ConfigurationInterfaces.c"
+#line 2941 "ConfigurationInterfaces.c"
 	}
 	__finally91:
 #line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2947,7 +2953,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 2946 "ConfigurationInterfaces.c"
+#line 2952 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -2957,7 +2963,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 2956 "ConfigurationInterfaces.c"
+#line 2962 "ConfigurationInterfaces.c"
 }
 
 
@@ -2988,7 +2994,7 @@ 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 2987 "ConfigurationInterfaces.c"
+#line 2993 "ConfigurationInterfaces.c"
 				goto __catch92_configuration_error;
 			}
 #line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2997,17 +3003,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 2996 "ConfigurationInterfaces.c"
+#line 3002 "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 3002 "ConfigurationInterfaces.c"
+#line 3008 "ConfigurationInterfaces.c"
 		} else {
 #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp4_ = s;
-#line 3006 "ConfigurationInterfaces.c"
+#line 3012 "ConfigurationInterfaces.c"
 		}
 #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = g_strdup (_tmp4_);
@@ -3017,7 +3023,7 @@ 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 3016 "ConfigurationInterfaces.c"
+#line 3022 "ConfigurationInterfaces.c"
 	}
 	goto __finally92;
 	__catch92_configuration_error:
@@ -3041,7 +3047,7 @@ 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 3040 "ConfigurationInterfaces.c"
+#line 3046 "ConfigurationInterfaces.c"
 	}
 	__finally92:
 #line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3050,7 +3056,7 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca
 	g_clear_error (&_inner_error_);
 #line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 3049 "ConfigurationInterfaces.c"
+#line 3055 "ConfigurationInterfaces.c"
 }
 
 
@@ -3059,7 +3065,7 @@ 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 3058 "ConfigurationInterfaces.c"
+#line 3064 "ConfigurationInterfaces.c"
 }
 
 
@@ -3076,7 +3082,7 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade
 		if (_tmp0_ == NULL) {
 #line 543 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			s = "";
-#line 3075 "ConfigurationInterfaces.c"
+#line 3081 "ConfigurationInterfaces.c"
 		}
 #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
@@ -3092,7 +3098,7 @@ 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 3091 "ConfigurationInterfaces.c"
+#line 3097 "ConfigurationInterfaces.c"
 				goto __catch93_configuration_error;
 			}
 #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3101,7 +3107,7 @@ 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 3100 "ConfigurationInterfaces.c"
+#line 3106 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally93;
@@ -3119,7 +3125,7 @@ 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 3118 "ConfigurationInterfaces.c"
+#line 3124 "ConfigurationInterfaces.c"
 	}
 	__finally93:
 #line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3130,7 +3136,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 3129 "ConfigurationInterfaces.c"
+#line 3135 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3140,7 +3146,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 3139 "ConfigurationInterfaces.c"
+#line 3145 "ConfigurationInterfaces.c"
 }
 
 
@@ -3170,7 +3176,7 @@ 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 3169 "ConfigurationInterfaces.c"
+#line 3175 "ConfigurationInterfaces.c"
 				goto __catch94_configuration_error;
 			}
 #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3179,7 +3185,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 3178 "ConfigurationInterfaces.c"
+#line 3184 "ConfigurationInterfaces.c"
 		}
 #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -3191,7 +3197,7 @@ 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 3190 "ConfigurationInterfaces.c"
+#line 3196 "ConfigurationInterfaces.c"
 	}
 	goto __finally94;
 	__catch94_configuration_error:
@@ -3215,7 +3221,7 @@ 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 3214 "ConfigurationInterfaces.c"
+#line 3220 "ConfigurationInterfaces.c"
 	}
 	__finally94:
 #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3224,7 +3230,7 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat
 	g_clear_error (&_inner_error_);
 #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 3223 "ConfigurationInterfaces.c"
+#line 3229 "ConfigurationInterfaces.c"
 }
 
 
@@ -3233,7 +3239,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 3232 "ConfigurationInterfaces.c"
+#line 3238 "ConfigurationInterfaces.c"
 }
 
 
@@ -3241,7 +3247,7 @@ 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 3240 "ConfigurationInterfaces.c"
+#line 3246 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -3260,7 +3266,7 @@ 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 3259 "ConfigurationInterfaces.c"
+#line 3265 "ConfigurationInterfaces.c"
 				goto __catch95_configuration_error;
 			}
 #line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3269,7 +3275,7 @@ 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 3268 "ConfigurationInterfaces.c"
+#line 3274 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally95;
@@ -3287,7 +3293,7 @@ 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 3286 "ConfigurationInterfaces.c"
+#line 3292 "ConfigurationInterfaces.c"
 	}
 	__finally95:
 #line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3298,7 +3304,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 3297 "ConfigurationInterfaces.c"
+#line 3303 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3308,7 +3314,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 3307 "ConfigurationInterfaces.c"
+#line 3313 "ConfigurationInterfaces.c"
 }
 
 
@@ -3320,7 +3326,7 @@ 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 3319 "ConfigurationInterfaces.c"
+#line 3325 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -3355,7 +3361,7 @@ 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 3354 "ConfigurationInterfaces.c"
+#line 3360 "ConfigurationInterfaces.c"
 				goto __catch96_configuration_error;
 			}
 #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3364,7 +3370,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 3363 "ConfigurationInterfaces.c"
+#line 3369 "ConfigurationInterfaces.c"
 		}
 #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_maximize = _tmp0_;
@@ -3384,7 +3390,7 @@ 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 3383 "ConfigurationInterfaces.c"
+#line 3389 "ConfigurationInterfaces.c"
 				goto __catch96_configuration_error;
 			}
 #line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3393,7 +3399,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 3392 "ConfigurationInterfaces.c"
+#line 3398 "ConfigurationInterfaces.c"
 		}
 #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = configuration_facade_get_engine (self);
@@ -3411,7 +3417,7 @@ 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 3410 "ConfigurationInterfaces.c"
+#line 3416 "ConfigurationInterfaces.c"
 				goto __catch96_configuration_error;
 			}
 #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3420,7 +3426,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 3419 "ConfigurationInterfaces.c"
+#line 3425 "ConfigurationInterfaces.c"
 		}
 #line 582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp13_ = w;
@@ -3428,7 +3434,7 @@ 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 3427 "ConfigurationInterfaces.c"
+#line 3433 "ConfigurationInterfaces.c"
 	}
 	goto __finally96;
 	__catch96_configuration_error:
@@ -3445,7 +3451,7 @@ 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 3444 "ConfigurationInterfaces.c"
+#line 3450 "ConfigurationInterfaces.c"
 	}
 	__finally96:
 #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3456,19 +3462,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 3455 "ConfigurationInterfaces.c"
+#line 3461 "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 3461 "ConfigurationInterfaces.c"
+#line 3467 "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 3467 "ConfigurationInterfaces.c"
+#line 3473 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3478,7 +3484,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 3477 "ConfigurationInterfaces.c"
+#line 3483 "ConfigurationInterfaces.c"
 }
 
 
@@ -3486,7 +3492,7 @@ 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 3485 "ConfigurationInterfaces.c"
+#line 3491 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -3513,7 +3519,7 @@ 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 3512 "ConfigurationInterfaces.c"
+#line 3518 "ConfigurationInterfaces.c"
 				goto __catch97_configuration_error;
 			}
 #line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3522,7 +3528,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 3521 "ConfigurationInterfaces.c"
+#line 3527 "ConfigurationInterfaces.c"
 		}
 #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -3540,7 +3546,7 @@ 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 3539 "ConfigurationInterfaces.c"
+#line 3545 "ConfigurationInterfaces.c"
 				goto __catch97_configuration_error;
 			}
 #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3549,7 +3555,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 3548 "ConfigurationInterfaces.c"
+#line 3554 "ConfigurationInterfaces.c"
 		}
 #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = configuration_facade_get_engine (self);
@@ -3567,7 +3573,7 @@ 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 3566 "ConfigurationInterfaces.c"
+#line 3572 "ConfigurationInterfaces.c"
 				goto __catch97_configuration_error;
 			}
 #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3576,7 +3582,7 @@ 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 3575 "ConfigurationInterfaces.c"
+#line 3581 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally97;
@@ -3594,7 +3600,7 @@ 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 3593 "ConfigurationInterfaces.c"
+#line 3599 "ConfigurationInterfaces.c"
 	}
 	__finally97:
 #line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3605,7 +3611,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 3604 "ConfigurationInterfaces.c"
+#line 3610 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3615,12 +3621,13 @@ 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 3614 "ConfigurationInterfaces.c"
+#line 3620 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_display_basic_properties (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -3642,9 +3649,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3643 "ConfigurationInterfaces.c"
+#line 3652 "ConfigurationInterfaces.c"
 				goto __catch98_configuration_error;
 			}
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3652,35 +3661,35 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 3652 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 3661 "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 3658 "ConfigurationInterfaces.c"
+#line 3667 "ConfigurationInterfaces.c"
 	}
 	goto __finally98;
 	__catch98_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
 #line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3679 "ConfigurationInterfaces.c"
+#line 3688 "ConfigurationInterfaces.c"
 	}
 	__finally98:
 #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3688,8 +3697,8 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur
 #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 FALSE;
-#line 3688 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 3697 "ConfigurationInterfaces.c"
 }
 
 
@@ -3698,7 +3707,7 @@ 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 3697 "ConfigurationInterfaces.c"
+#line 3706 "ConfigurationInterfaces.c"
 }
 
 
@@ -3722,7 +3731,7 @@ 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 3721 "ConfigurationInterfaces.c"
+#line 3730 "ConfigurationInterfaces.c"
 				goto __catch99_configuration_error;
 			}
 #line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3731,7 +3740,7 @@ 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 3730 "ConfigurationInterfaces.c"
+#line 3739 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally99;
@@ -3749,7 +3758,7 @@ 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 3748 "ConfigurationInterfaces.c"
+#line 3757 "ConfigurationInterfaces.c"
 	}
 	__finally99:
 #line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3760,7 +3769,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 3759 "ConfigurationInterfaces.c"
+#line 3768 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3770,12 +3779,13 @@ 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 3769 "ConfigurationInterfaces.c"
+#line 3778 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_display_extended_properties (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -3797,9 +3807,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3798 "ConfigurationInterfaces.c"
+#line 3810 "ConfigurationInterfaces.c"
 				goto __catch100_configuration_error;
 			}
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3807,35 +3819,35 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 3807 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 3819 "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 3813 "ConfigurationInterfaces.c"
+#line 3825 "ConfigurationInterfaces.c"
 	}
 	goto __finally100;
 	__catch100_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
 #line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3834 "ConfigurationInterfaces.c"
+#line 3846 "ConfigurationInterfaces.c"
 	}
 	__finally100:
 #line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3843,8 +3855,8 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi
 #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 FALSE;
-#line 3843 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 3855 "ConfigurationInterfaces.c"
 }
 
 
@@ -3853,7 +3865,7 @@ 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 3852 "ConfigurationInterfaces.c"
+#line 3864 "ConfigurationInterfaces.c"
 }
 
 
@@ -3877,7 +3889,7 @@ 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 3876 "ConfigurationInterfaces.c"
+#line 3888 "ConfigurationInterfaces.c"
 				goto __catch101_configuration_error;
 			}
 #line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3886,7 +3898,7 @@ 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 3885 "ConfigurationInterfaces.c"
+#line 3897 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally101;
@@ -3904,7 +3916,7 @@ 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 3903 "ConfigurationInterfaces.c"
+#line 3915 "ConfigurationInterfaces.c"
 	}
 	__finally101:
 #line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3915,7 +3927,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 3914 "ConfigurationInterfaces.c"
+#line 3926 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3925,12 +3937,13 @@ 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 3924 "ConfigurationInterfaces.c"
+#line 3936 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -3952,9 +3965,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3953 "ConfigurationInterfaces.c"
+#line 3968 "ConfigurationInterfaces.c"
 				goto __catch102_configuration_error;
 			}
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3962,35 +3977,35 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 3962 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 3977 "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 3968 "ConfigurationInterfaces.c"
+#line 3983 "ConfigurationInterfaces.c"
 	}
 	goto __finally102;
 	__catch102_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
 #line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3989 "ConfigurationInterfaces.c"
+#line 4004 "ConfigurationInterfaces.c"
 	}
 	__finally102:
 #line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3998,8 +4013,8 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca
 #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 FALSE;
-#line 3998 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 4013 "ConfigurationInterfaces.c"
 }
 
 
@@ -4008,7 +4023,7 @@ 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 4007 "ConfigurationInterfaces.c"
+#line 4022 "ConfigurationInterfaces.c"
 }
 
 
@@ -4032,7 +4047,7 @@ 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 4031 "ConfigurationInterfaces.c"
+#line 4046 "ConfigurationInterfaces.c"
 				goto __catch103_configuration_error;
 			}
 #line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4041,7 +4056,7 @@ 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 4040 "ConfigurationInterfaces.c"
+#line 4055 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally103;
@@ -4059,7 +4074,7 @@ 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 4058 "ConfigurationInterfaces.c"
+#line 4073 "ConfigurationInterfaces.c"
 	}
 	__finally103:
 #line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4070,7 +4085,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 4069 "ConfigurationInterfaces.c"
+#line 4084 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4080,12 +4095,13 @@ 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 4079 "ConfigurationInterfaces.c"
+#line 4094 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -4107,9 +4123,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4108 "ConfigurationInterfaces.c"
+#line 4126 "ConfigurationInterfaces.c"
 				goto __catch104_configuration_error;
 			}
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4117,35 +4135,35 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 4117 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 4135 "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 4123 "ConfigurationInterfaces.c"
+#line 4141 "ConfigurationInterfaces.c"
 	}
 	goto __finally104;
 	__catch104_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
 #line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4144 "ConfigurationInterfaces.c"
+#line 4162 "ConfigurationInterfaces.c"
 	}
 	__finally104:
 #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4153,8 +4171,8 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca
 #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 FALSE;
-#line 4153 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 4171 "ConfigurationInterfaces.c"
 }
 
 
@@ -4163,7 +4181,7 @@ 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 4162 "ConfigurationInterfaces.c"
+#line 4180 "ConfigurationInterfaces.c"
 }
 
 
@@ -4187,7 +4205,7 @@ 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 4186 "ConfigurationInterfaces.c"
+#line 4204 "ConfigurationInterfaces.c"
 				goto __catch105_configuration_error;
 			}
 #line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4196,7 +4214,7 @@ 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 4195 "ConfigurationInterfaces.c"
+#line 4213 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally105;
@@ -4214,7 +4232,7 @@ 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 4213 "ConfigurationInterfaces.c"
+#line 4231 "ConfigurationInterfaces.c"
 	}
 	__finally105:
 #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4225,7 +4243,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 4224 "ConfigurationInterfaces.c"
+#line 4242 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4235,12 +4253,13 @@ 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 4234 "ConfigurationInterfaces.c"
+#line 4252 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_display_search_bar (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -4262,9 +4281,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4263 "ConfigurationInterfaces.c"
+#line 4284 "ConfigurationInterfaces.c"
 				goto __catch106_configuration_error;
 			}
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4272,35 +4293,35 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 4272 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 4293 "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 4278 "ConfigurationInterfaces.c"
+#line 4299 "ConfigurationInterfaces.c"
 	}
 	goto __finally106;
 	__catch106_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
 #line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4299 "ConfigurationInterfaces.c"
+#line 4320 "ConfigurationInterfaces.c"
 	}
 	__finally106:
 #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4308,8 +4329,8 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF
 #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 FALSE;
-#line 4308 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 4329 "ConfigurationInterfaces.c"
 }
 
 
@@ -4318,7 +4339,7 @@ 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 4317 "ConfigurationInterfaces.c"
+#line 4338 "ConfigurationInterfaces.c"
 }
 
 
@@ -4342,7 +4363,7 @@ 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 4341 "ConfigurationInterfaces.c"
+#line 4362 "ConfigurationInterfaces.c"
 				goto __catch107_configuration_error;
 			}
 #line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4351,7 +4372,7 @@ 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 4350 "ConfigurationInterfaces.c"
+#line 4371 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally107;
@@ -4369,7 +4390,7 @@ 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 4368 "ConfigurationInterfaces.c"
+#line 4389 "ConfigurationInterfaces.c"
 	}
 	__finally107:
 #line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4380,7 +4401,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 4379 "ConfigurationInterfaces.c"
+#line 4400 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4390,12 +4411,13 @@ 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 4389 "ConfigurationInterfaces.c"
+#line 4410 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_display_photo_ratings (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -4417,9 +4439,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4418 "ConfigurationInterfaces.c"
+#line 4442 "ConfigurationInterfaces.c"
 				goto __catch108_configuration_error;
 			}
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4427,35 +4451,35 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 4427 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 4451 "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 4433 "ConfigurationInterfaces.c"
+#line 4457 "ConfigurationInterfaces.c"
 	}
 	goto __finally108;
 	__catch108_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 714 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 714 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
 #line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4454 "ConfigurationInterfaces.c"
+#line 4478 "ConfigurationInterfaces.c"
 	}
 	__finally108:
 #line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4463,8 +4487,8 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati
 #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 FALSE;
-#line 4463 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 4487 "ConfigurationInterfaces.c"
 }
 
 
@@ -4473,7 +4497,7 @@ 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 4472 "ConfigurationInterfaces.c"
+#line 4496 "ConfigurationInterfaces.c"
 }
 
 
@@ -4497,7 +4521,7 @@ 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 4496 "ConfigurationInterfaces.c"
+#line 4520 "ConfigurationInterfaces.c"
 				goto __catch109_configuration_error;
 			}
 #line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4506,7 +4530,7 @@ 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 4505 "ConfigurationInterfaces.c"
+#line 4529 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally109;
@@ -4524,7 +4548,7 @@ 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 4523 "ConfigurationInterfaces.c"
+#line 4547 "ConfigurationInterfaces.c"
 	}
 	__finally109:
 #line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4535,7 +4559,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 4534 "ConfigurationInterfaces.c"
+#line 4558 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4545,12 +4569,13 @@ 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 4544 "ConfigurationInterfaces.c"
+#line 4568 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -4572,9 +4597,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4573 "ConfigurationInterfaces.c"
+#line 4600 "ConfigurationInterfaces.c"
 				goto __catch110_configuration_error;
 			}
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4582,35 +4609,35 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 4582 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 4609 "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 4588 "ConfigurationInterfaces.c"
+#line 4615 "ConfigurationInterfaces.c"
 	}
 	goto __finally110;
 	__catch110_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 735 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 735 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
 #line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4609 "ConfigurationInterfaces.c"
+#line 4636 "ConfigurationInterfaces.c"
 	}
 	__finally110:
 #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4618,8 +4645,8 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF
 #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 FALSE;
-#line 4618 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 4645 "ConfigurationInterfaces.c"
 }
 
 
@@ -4628,7 +4655,7 @@ 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 4627 "ConfigurationInterfaces.c"
+#line 4654 "ConfigurationInterfaces.c"
 }
 
 
@@ -4652,7 +4679,7 @@ 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 4651 "ConfigurationInterfaces.c"
+#line 4678 "ConfigurationInterfaces.c"
 				goto __catch111_configuration_error;
 			}
 #line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4661,7 +4688,7 @@ 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 4660 "ConfigurationInterfaces.c"
+#line 4687 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally111;
@@ -4679,7 +4706,7 @@ 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 4678 "ConfigurationInterfaces.c"
+#line 4705 "ConfigurationInterfaces.c"
 	}
 	__finally111:
 #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4690,7 +4717,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 4689 "ConfigurationInterfaces.c"
+#line 4716 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4700,12 +4727,13 @@ 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 4699 "ConfigurationInterfaces.c"
+#line 4726 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_display_photo_titles (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -4727,9 +4755,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4728 "ConfigurationInterfaces.c"
+#line 4758 "ConfigurationInterfaces.c"
 				goto __catch112_configuration_error;
 			}
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4737,35 +4767,35 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 4737 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 4767 "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 4743 "ConfigurationInterfaces.c"
+#line 4773 "ConfigurationInterfaces.c"
 	}
 	goto __finally112;
 	__catch112_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
 #line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4764 "ConfigurationInterfaces.c"
+#line 4794 "ConfigurationInterfaces.c"
 	}
 	__finally112:
 #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4773,8 +4803,8 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio
 #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 FALSE;
-#line 4773 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 4803 "ConfigurationInterfaces.c"
 }
 
 
@@ -4783,7 +4813,7 @@ 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 4782 "ConfigurationInterfaces.c"
+#line 4812 "ConfigurationInterfaces.c"
 }
 
 
@@ -4807,7 +4837,7 @@ 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 4806 "ConfigurationInterfaces.c"
+#line 4836 "ConfigurationInterfaces.c"
 				goto __catch113_configuration_error;
 			}
 #line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4816,7 +4846,7 @@ 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 4815 "ConfigurationInterfaces.c"
+#line 4845 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally113;
@@ -4834,7 +4864,7 @@ 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 4833 "ConfigurationInterfaces.c"
+#line 4863 "ConfigurationInterfaces.c"
 	}
 	__finally113:
 #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4845,7 +4875,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 4844 "ConfigurationInterfaces.c"
+#line 4874 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4855,12 +4885,13 @@ 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 4854 "ConfigurationInterfaces.c"
+#line 4884 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_display_photo_comments (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -4882,9 +4913,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4883 "ConfigurationInterfaces.c"
+#line 4916 "ConfigurationInterfaces.c"
 				goto __catch114_configuration_error;
 			}
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4892,35 +4925,35 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 4892 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 4925 "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 4898 "ConfigurationInterfaces.c"
+#line 4931 "ConfigurationInterfaces.c"
 	}
 	goto __finally114;
 	__catch114_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
 #line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4919 "ConfigurationInterfaces.c"
+#line 4952 "ConfigurationInterfaces.c"
 	}
 	__finally114:
 #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4928,8 +4961,8 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat
 #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 FALSE;
-#line 4928 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 4961 "ConfigurationInterfaces.c"
 }
 
 
@@ -4938,7 +4971,7 @@ 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 4937 "ConfigurationInterfaces.c"
+#line 4970 "ConfigurationInterfaces.c"
 }
 
 
@@ -4962,7 +4995,7 @@ 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 4961 "ConfigurationInterfaces.c"
+#line 4994 "ConfigurationInterfaces.c"
 				goto __catch115_configuration_error;
 			}
 #line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4971,7 +5004,7 @@ 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 4970 "ConfigurationInterfaces.c"
+#line 5003 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally115;
@@ -4989,7 +5022,7 @@ 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 4988 "ConfigurationInterfaces.c"
+#line 5021 "ConfigurationInterfaces.c"
 	}
 	__finally115:
 #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5000,7 +5033,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 4999 "ConfigurationInterfaces.c"
+#line 5032 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5010,12 +5043,13 @@ 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 5009 "ConfigurationInterfaces.c"
+#line 5042 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_display_event_comments (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -5037,9 +5071,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5038 "ConfigurationInterfaces.c"
+#line 5074 "ConfigurationInterfaces.c"
 				goto __catch116_configuration_error;
 			}
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5047,35 +5083,35 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 5047 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 5083 "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 5053 "ConfigurationInterfaces.c"
+#line 5089 "ConfigurationInterfaces.c"
 	}
 	goto __finally116;
 	__catch116_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
 #line 800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5074 "ConfigurationInterfaces.c"
+#line 5110 "ConfigurationInterfaces.c"
 	}
 	__finally116:
 #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5083,8 +5119,8 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat
 #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 FALSE;
-#line 5083 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 5119 "ConfigurationInterfaces.c"
 }
 
 
@@ -5093,7 +5129,7 @@ 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 5092 "ConfigurationInterfaces.c"
+#line 5128 "ConfigurationInterfaces.c"
 }
 
 
@@ -5117,7 +5153,7 @@ 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 5116 "ConfigurationInterfaces.c"
+#line 5152 "ConfigurationInterfaces.c"
 				goto __catch117_configuration_error;
 			}
 #line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5126,7 +5162,7 @@ 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 5125 "ConfigurationInterfaces.c"
+#line 5161 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally117;
@@ -5144,7 +5180,7 @@ 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 5143 "ConfigurationInterfaces.c"
+#line 5179 "ConfigurationInterfaces.c"
 	}
 	__finally117:
 #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5155,7 +5191,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 5154 "ConfigurationInterfaces.c"
+#line 5190 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5165,7 +5201,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 5164 "ConfigurationInterfaces.c"
+#line 5200 "ConfigurationInterfaces.c"
 }
 
 
@@ -5177,7 +5213,7 @@ 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 5176 "ConfigurationInterfaces.c"
+#line 5212 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -5205,7 +5241,7 @@ 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 5204 "ConfigurationInterfaces.c"
+#line 5240 "ConfigurationInterfaces.c"
 				goto __catch118_configuration_error;
 			}
 #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5214,7 +5250,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 5213 "ConfigurationInterfaces.c"
+#line 5249 "ConfigurationInterfaces.c"
 		}
 #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_order = _tmp0_;
@@ -5234,7 +5270,7 @@ 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 5233 "ConfigurationInterfaces.c"
+#line 5269 "ConfigurationInterfaces.c"
 				goto __catch118_configuration_error;
 			}
 #line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5243,11 +5279,11 @@ 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 5242 "ConfigurationInterfaces.c"
+#line 5278 "ConfigurationInterfaces.c"
 		}
 #line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_by = _tmp5_;
-#line 5246 "ConfigurationInterfaces.c"
+#line 5282 "ConfigurationInterfaces.c"
 	}
 	goto __finally118;
 	__catch118_configuration_error:
@@ -5264,7 +5300,7 @@ 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 5263 "ConfigurationInterfaces.c"
+#line 5299 "ConfigurationInterfaces.c"
 	}
 	__finally118:
 #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5275,19 +5311,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 5274 "ConfigurationInterfaces.c"
+#line 5310 "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 5280 "ConfigurationInterfaces.c"
+#line 5316 "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 5286 "ConfigurationInterfaces.c"
+#line 5322 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5297,7 +5333,7 @@ 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 5296 "ConfigurationInterfaces.c"
+#line 5332 "ConfigurationInterfaces.c"
 }
 
 
@@ -5324,7 +5360,7 @@ 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 5323 "ConfigurationInterfaces.c"
+#line 5359 "ConfigurationInterfaces.c"
 				goto __catch119_configuration_error;
 			}
 #line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5333,7 +5369,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 5332 "ConfigurationInterfaces.c"
+#line 5368 "ConfigurationInterfaces.c"
 		}
 #line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -5349,7 +5385,7 @@ 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 5348 "ConfigurationInterfaces.c"
+#line 5384 "ConfigurationInterfaces.c"
 				goto __catch119_configuration_error;
 			}
 #line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5358,7 +5394,7 @@ 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 5357 "ConfigurationInterfaces.c"
+#line 5393 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally119;
@@ -5376,7 +5412,7 @@ 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 5375 "ConfigurationInterfaces.c"
+#line 5411 "ConfigurationInterfaces.c"
 	}
 	__finally119:
 #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5387,7 +5423,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 5386 "ConfigurationInterfaces.c"
+#line 5422 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5397,12 +5433,13 @@ 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 5396 "ConfigurationInterfaces.c"
+#line 5432 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_events_sort_ascending (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -5424,9 +5461,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5425 "ConfigurationInterfaces.c"
+#line 5464 "ConfigurationInterfaces.c"
 				goto __catch120_configuration_error;
 			}
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5434,35 +5473,35 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 5434 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 5473 "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 5440 "ConfigurationInterfaces.c"
+#line 5479 "ConfigurationInterfaces.c"
 	}
 	goto __finally120;
 	__catch120_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
 #line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5461 "ConfigurationInterfaces.c"
+#line 5500 "ConfigurationInterfaces.c"
 	}
 	__finally120:
 #line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5470,8 +5509,8 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati
 #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 FALSE;
-#line 5470 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 5509 "ConfigurationInterfaces.c"
 }
 
 
@@ -5480,7 +5519,7 @@ 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 5479 "ConfigurationInterfaces.c"
+#line 5518 "ConfigurationInterfaces.c"
 }
 
 
@@ -5504,7 +5543,7 @@ 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 5503 "ConfigurationInterfaces.c"
+#line 5542 "ConfigurationInterfaces.c"
 				goto __catch121_configuration_error;
 			}
 #line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5513,7 +5552,7 @@ 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 5512 "ConfigurationInterfaces.c"
+#line 5551 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally121;
@@ -5533,7 +5572,7 @@ 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 5532 "ConfigurationInterfaces.c"
+#line 5571 "ConfigurationInterfaces.c"
 	}
 	__finally121:
 #line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5544,7 +5583,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 5543 "ConfigurationInterfaces.c"
+#line 5582 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5554,7 +5593,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 5553 "ConfigurationInterfaces.c"
+#line 5592 "ConfigurationInterfaces.c"
 }
 
 
@@ -5584,7 +5623,7 @@ 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 5583 "ConfigurationInterfaces.c"
+#line 5622 "ConfigurationInterfaces.c"
 				goto __catch122_configuration_error;
 			}
 #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5593,7 +5632,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 5592 "ConfigurationInterfaces.c"
+#line 5631 "ConfigurationInterfaces.c"
 		}
 #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -5605,7 +5644,7 @@ 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 5604 "ConfigurationInterfaces.c"
+#line 5643 "ConfigurationInterfaces.c"
 	}
 	goto __finally122;
 	__catch122_configuration_error:
@@ -5629,7 +5668,7 @@ 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 5628 "ConfigurationInterfaces.c"
+#line 5667 "ConfigurationInterfaces.c"
 	}
 	__finally122:
 #line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5638,7 +5677,7 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac
 	g_clear_error (&_inner_error_);
 #line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 5637 "ConfigurationInterfaces.c"
+#line 5676 "ConfigurationInterfaces.c"
 }
 
 
@@ -5647,7 +5686,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 5646 "ConfigurationInterfaces.c"
+#line 5685 "ConfigurationInterfaces.c"
 }
 
 
@@ -5655,7 +5694,7 @@ 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 5654 "ConfigurationInterfaces.c"
+#line 5693 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -5674,7 +5713,7 @@ 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 5673 "ConfigurationInterfaces.c"
+#line 5712 "ConfigurationInterfaces.c"
 				goto __catch123_configuration_error;
 			}
 #line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5683,7 +5722,7 @@ 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 5682 "ConfigurationInterfaces.c"
+#line 5721 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally123;
@@ -5703,7 +5742,7 @@ 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 5702 "ConfigurationInterfaces.c"
+#line 5741 "ConfigurationInterfaces.c"
 	}
 	__finally123:
 #line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5714,7 +5753,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 5713 "ConfigurationInterfaces.c"
+#line 5752 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5724,7 +5763,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 5723 "ConfigurationInterfaces.c"
+#line 5762 "ConfigurationInterfaces.c"
 }
 
 
@@ -5754,7 +5793,7 @@ 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 5753 "ConfigurationInterfaces.c"
+#line 5792 "ConfigurationInterfaces.c"
 				goto __catch124_configuration_error;
 			}
 #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5763,7 +5802,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 5762 "ConfigurationInterfaces.c"
+#line 5801 "ConfigurationInterfaces.c"
 		}
 #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -5775,7 +5814,7 @@ 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 5774 "ConfigurationInterfaces.c"
+#line 5813 "ConfigurationInterfaces.c"
 	}
 	goto __finally124;
 	__catch124_configuration_error:
@@ -5799,7 +5838,7 @@ 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 5798 "ConfigurationInterfaces.c"
+#line 5837 "ConfigurationInterfaces.c"
 	}
 	__finally124:
 #line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5808,7 +5847,7 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad
 	g_clear_error (&_inner_error_);
 #line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 5807 "ConfigurationInterfaces.c"
+#line 5846 "ConfigurationInterfaces.c"
 }
 
 
@@ -5817,7 +5856,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 5816 "ConfigurationInterfaces.c"
+#line 5855 "ConfigurationInterfaces.c"
 }
 
 
@@ -5825,7 +5864,7 @@ 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 5824 "ConfigurationInterfaces.c"
+#line 5863 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -5844,7 +5883,7 @@ 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 5843 "ConfigurationInterfaces.c"
+#line 5882 "ConfigurationInterfaces.c"
 				goto __catch125_configuration_error;
 			}
 #line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5853,7 +5892,7 @@ 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 5852 "ConfigurationInterfaces.c"
+#line 5891 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally125;
@@ -5873,7 +5912,7 @@ 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 5872 "ConfigurationInterfaces.c"
+#line 5911 "ConfigurationInterfaces.c"
 	}
 	__finally125:
 #line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5884,7 +5923,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 5883 "ConfigurationInterfaces.c"
+#line 5922 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5894,7 +5933,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 5893 "ConfigurationInterfaces.c"
+#line 5932 "ConfigurationInterfaces.c"
 }
 
 
@@ -5923,7 +5962,7 @@ 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 5922 "ConfigurationInterfaces.c"
+#line 5961 "ConfigurationInterfaces.c"
 				goto __catch126_configuration_error;
 			}
 #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5932,13 +5971,13 @@ 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 5931 "ConfigurationInterfaces.c"
+#line 5970 "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 5937 "ConfigurationInterfaces.c"
+#line 5976 "ConfigurationInterfaces.c"
 	}
 	goto __finally126;
 	__catch126_configuration_error:
@@ -5959,7 +5998,7 @@ 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 5958 "ConfigurationInterfaces.c"
+#line 5997 "ConfigurationInterfaces.c"
 	}
 	__finally126:
 #line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5968,7 +6007,7 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur
 	g_clear_error (&_inner_error_);
 #line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 5967 "ConfigurationInterfaces.c"
+#line 6006 "ConfigurationInterfaces.c"
 }
 
 
@@ -5977,7 +6016,7 @@ 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 5976 "ConfigurationInterfaces.c"
+#line 6015 "ConfigurationInterfaces.c"
 }
 
 
@@ -6001,7 +6040,7 @@ 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 6000 "ConfigurationInterfaces.c"
+#line 6039 "ConfigurationInterfaces.c"
 				goto __catch127_configuration_error;
 			}
 #line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6010,7 +6049,7 @@ 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 6009 "ConfigurationInterfaces.c"
+#line 6048 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally127;
@@ -6030,7 +6069,7 @@ 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 6029 "ConfigurationInterfaces.c"
+#line 6068 "ConfigurationInterfaces.c"
 	}
 	__finally127:
 #line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6041,7 +6080,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 6040 "ConfigurationInterfaces.c"
+#line 6079 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6051,7 +6090,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 6050 "ConfigurationInterfaces.c"
+#line 6089 "ConfigurationInterfaces.c"
 }
 
 
@@ -6080,7 +6119,7 @@ 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 6079 "ConfigurationInterfaces.c"
+#line 6118 "ConfigurationInterfaces.c"
 				goto __catch128_configuration_error;
 			}
 #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6089,13 +6128,13 @@ 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 6088 "ConfigurationInterfaces.c"
+#line 6127 "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 6094 "ConfigurationInterfaces.c"
+#line 6133 "ConfigurationInterfaces.c"
 	}
 	goto __finally128;
 	__catch128_configuration_error:
@@ -6116,7 +6155,7 @@ 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 6115 "ConfigurationInterfaces.c"
+#line 6154 "ConfigurationInterfaces.c"
 	}
 	__finally128:
 #line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6125,7 +6164,7 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode
 	g_clear_error (&_inner_error_);
 #line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6124 "ConfigurationInterfaces.c"
+#line 6163 "ConfigurationInterfaces.c"
 }
 
 
@@ -6134,7 +6173,7 @@ 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 6133 "ConfigurationInterfaces.c"
+#line 6172 "ConfigurationInterfaces.c"
 }
 
 
@@ -6158,7 +6197,7 @@ 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 6157 "ConfigurationInterfaces.c"
+#line 6196 "ConfigurationInterfaces.c"
 				goto __catch129_configuration_error;
 			}
 #line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6167,7 +6206,7 @@ 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 6166 "ConfigurationInterfaces.c"
+#line 6205 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally129;
@@ -6187,7 +6226,7 @@ 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 6186 "ConfigurationInterfaces.c"
+#line 6225 "ConfigurationInterfaces.c"
 	}
 	__finally129:
 #line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6198,7 +6237,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 6197 "ConfigurationInterfaces.c"
+#line 6236 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6208,12 +6247,13 @@ 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 6207 "ConfigurationInterfaces.c"
+#line 6246 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_export_export_metadata (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -6235,9 +6275,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6236 "ConfigurationInterfaces.c"
+#line 6278 "ConfigurationInterfaces.c"
 				goto __catch130_configuration_error;
 			}
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6245,35 +6287,35 @@ static gboolean configuration_facade_real_get_export_export_metadata (Configurat
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 6245 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 6287 "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 6251 "ConfigurationInterfaces.c"
+#line 6293 "ConfigurationInterfaces.c"
 	}
 	goto __finally130;
 	__catch130_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 951 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 951 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 953 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
 #line 953 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 953 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6272 "ConfigurationInterfaces.c"
+#line 6314 "ConfigurationInterfaces.c"
 	}
 	__finally130:
 #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6281,8 +6323,8 @@ static gboolean configuration_facade_real_get_export_export_metadata (Configurat
 #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 FALSE;
-#line 6281 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 6323 "ConfigurationInterfaces.c"
 }
 
 
@@ -6291,7 +6333,7 @@ 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 6290 "ConfigurationInterfaces.c"
+#line 6332 "ConfigurationInterfaces.c"
 }
 
 
@@ -6315,7 +6357,7 @@ 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 6314 "ConfigurationInterfaces.c"
+#line 6356 "ConfigurationInterfaces.c"
 				goto __catch131_configuration_error;
 			}
 #line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6324,7 +6366,7 @@ 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 6323 "ConfigurationInterfaces.c"
+#line 6365 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally131;
@@ -6344,7 +6386,7 @@ 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 6343 "ConfigurationInterfaces.c"
+#line 6385 "ConfigurationInterfaces.c"
 	}
 	__finally131:
 #line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6355,7 +6397,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 6354 "ConfigurationInterfaces.c"
+#line 6396 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6365,7 +6407,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 6364 "ConfigurationInterfaces.c"
+#line 6406 "ConfigurationInterfaces.c"
 }
 
 
@@ -6395,7 +6437,7 @@ 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 6394 "ConfigurationInterfaces.c"
+#line 6436 "ConfigurationInterfaces.c"
 				goto __catch132_configuration_error;
 			}
 #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6404,7 +6446,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 6403 "ConfigurationInterfaces.c"
+#line 6445 "ConfigurationInterfaces.c"
 		}
 #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = photo_file_format_unserialize (_tmp0_);
@@ -6412,7 +6454,7 @@ 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 6411 "ConfigurationInterfaces.c"
+#line 6453 "ConfigurationInterfaces.c"
 	}
 	goto __finally132;
 	__catch132_configuration_error:
@@ -6433,7 +6475,7 @@ 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 6432 "ConfigurationInterfaces.c"
+#line 6474 "ConfigurationInterfaces.c"
 	}
 	__finally132:
 #line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6442,7 +6484,7 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C
 	g_clear_error (&_inner_error_);
 #line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6441 "ConfigurationInterfaces.c"
+#line 6483 "ConfigurationInterfaces.c"
 }
 
 
@@ -6451,7 +6493,7 @@ 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 6450 "ConfigurationInterfaces.c"
+#line 6492 "ConfigurationInterfaces.c"
 }
 
 
@@ -6478,7 +6520,7 @@ 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 6477 "ConfigurationInterfaces.c"
+#line 6519 "ConfigurationInterfaces.c"
 				goto __catch133_configuration_error;
 			}
 #line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6487,7 +6529,7 @@ 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 6486 "ConfigurationInterfaces.c"
+#line 6528 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally133;
@@ -6507,7 +6549,7 @@ 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 6506 "ConfigurationInterfaces.c"
+#line 6548 "ConfigurationInterfaces.c"
 	}
 	__finally133:
 #line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6518,7 +6560,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 6517 "ConfigurationInterfaces.c"
+#line 6559 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6528,7 +6570,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 6527 "ConfigurationInterfaces.c"
+#line 6569 "ConfigurationInterfaces.c"
 }
 
 
@@ -6557,7 +6599,7 @@ 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 6556 "ConfigurationInterfaces.c"
+#line 6598 "ConfigurationInterfaces.c"
 				goto __catch134_configuration_error;
 			}
 #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6566,13 +6608,13 @@ 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 6565 "ConfigurationInterfaces.c"
+#line 6607 "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 6571 "ConfigurationInterfaces.c"
+#line 6613 "ConfigurationInterfaces.c"
 	}
 	goto __finally134;
 	__catch134_configuration_error:
@@ -6593,7 +6635,7 @@ 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 6592 "ConfigurationInterfaces.c"
+#line 6634 "ConfigurationInterfaces.c"
 	}
 	__finally134:
 #line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6602,7 +6644,7 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa
 	g_clear_error (&_inner_error_);
 #line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6601 "ConfigurationInterfaces.c"
+#line 6643 "ConfigurationInterfaces.c"
 }
 
 
@@ -6611,7 +6653,7 @@ 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 6610 "ConfigurationInterfaces.c"
+#line 6652 "ConfigurationInterfaces.c"
 }
 
 
@@ -6635,7 +6677,7 @@ 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 6634 "ConfigurationInterfaces.c"
+#line 6676 "ConfigurationInterfaces.c"
 				goto __catch135_configuration_error;
 			}
 #line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6644,7 +6686,7 @@ 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 6643 "ConfigurationInterfaces.c"
+#line 6685 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally135;
@@ -6664,7 +6706,7 @@ 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 6663 "ConfigurationInterfaces.c"
+#line 6705 "ConfigurationInterfaces.c"
 	}
 	__finally135:
 #line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6675,7 +6717,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 6674 "ConfigurationInterfaces.c"
+#line 6716 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6685,12 +6727,13 @@ 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 6684 "ConfigurationInterfaces.c"
+#line 6726 "ConfigurationInterfaces.c"
 }
 
 
 static gint configuration_facade_real_get_export_scale (ConfigurationFacade* self) {
 	gint result = 0;
+	gint _tmp7_ = 0;
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
@@ -6712,9 +6755,11 @@ 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"
+			gint _tmp5_ = 0;
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6713 "ConfigurationInterfaces.c"
+#line 6758 "ConfigurationInterfaces.c"
 				goto __catch136_configuration_error;
 			}
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6722,35 +6767,35 @@ static gint configuration_facade_real_get_export_scale (ConfigurationFacade* sel
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return 0;
-#line 6722 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 6767 "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 6728 "ConfigurationInterfaces.c"
+#line 6773 "ConfigurationInterfaces.c"
 	}
 	goto __finally136;
 	__catch136_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1008 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1008 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
 #line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6749 "ConfigurationInterfaces.c"
+#line 6794 "ConfigurationInterfaces.c"
 	}
 	__finally136:
 #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6758,8 +6803,8 @@ static gint configuration_facade_real_get_export_scale (ConfigurationFacade* sel
 #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 0;
-#line 6758 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 6803 "ConfigurationInterfaces.c"
 }
 
 
@@ -6768,7 +6813,7 @@ 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 6767 "ConfigurationInterfaces.c"
+#line 6812 "ConfigurationInterfaces.c"
 }
 
 
@@ -6792,7 +6837,7 @@ 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 6791 "ConfigurationInterfaces.c"
+#line 6836 "ConfigurationInterfaces.c"
 				goto __catch137_configuration_error;
 			}
 #line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6801,7 +6846,7 @@ 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 6800 "ConfigurationInterfaces.c"
+#line 6845 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally137;
@@ -6821,7 +6866,7 @@ 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 6820 "ConfigurationInterfaces.c"
+#line 6865 "ConfigurationInterfaces.c"
 	}
 	__finally137:
 #line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6832,7 +6877,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 6831 "ConfigurationInterfaces.c"
+#line 6876 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6842,7 +6887,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 6841 "ConfigurationInterfaces.c"
+#line 6886 "ConfigurationInterfaces.c"
 }
 
 
@@ -6872,7 +6917,7 @@ 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 6871 "ConfigurationInterfaces.c"
+#line 6916 "ConfigurationInterfaces.c"
 				goto __catch138_configuration_error;
 			}
 #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6881,7 +6926,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 6880 "ConfigurationInterfaces.c"
+#line 6925 "ConfigurationInterfaces.c"
 		}
 #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = raw_developer_from_string (_tmp0_);
@@ -6891,7 +6936,7 @@ 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 6890 "ConfigurationInterfaces.c"
+#line 6935 "ConfigurationInterfaces.c"
 	}
 	goto __finally138;
 	__catch138_configuration_error:
@@ -6912,7 +6957,7 @@ 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 6911 "ConfigurationInterfaces.c"
+#line 6956 "ConfigurationInterfaces.c"
 	}
 	__finally138:
 #line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6921,7 +6966,7 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu
 	g_clear_error (&_inner_error_);
 #line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6920 "ConfigurationInterfaces.c"
+#line 6965 "ConfigurationInterfaces.c"
 }
 
 
@@ -6930,7 +6975,7 @@ 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 6929 "ConfigurationInterfaces.c"
+#line 6974 "ConfigurationInterfaces.c"
 }
 
 
@@ -6962,7 +7007,7 @@ 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 6961 "ConfigurationInterfaces.c"
+#line 7006 "ConfigurationInterfaces.c"
 				goto __catch139_configuration_error;
 			}
 #line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6971,7 +7016,7 @@ 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 6970 "ConfigurationInterfaces.c"
+#line 7015 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally139;
@@ -6991,7 +7036,7 @@ 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 6990 "ConfigurationInterfaces.c"
+#line 7035 "ConfigurationInterfaces.c"
 	}
 	__finally139:
 #line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7002,7 +7047,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 7001 "ConfigurationInterfaces.c"
+#line 7046 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7012,12 +7057,13 @@ 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 7011 "ConfigurationInterfaces.c"
+#line 7056 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_hide_photos_already_imported (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -7039,9 +7085,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7040 "ConfigurationInterfaces.c"
+#line 7088 "ConfigurationInterfaces.c"
 				goto __catch140_configuration_error;
 			}
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7049,35 +7097,35 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 7049 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 7097 "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 7055 "ConfigurationInterfaces.c"
+#line 7103 "ConfigurationInterfaces.c"
 	}
 	goto __finally140;
 	__catch140_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1054 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1054 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1056 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
 #line 1056 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1056 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7076 "ConfigurationInterfaces.c"
+#line 7124 "ConfigurationInterfaces.c"
 	}
 	__finally140:
 #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7085,8 +7133,8 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf
 #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 FALSE;
-#line 7085 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 7133 "ConfigurationInterfaces.c"
 }
 
 
@@ -7095,7 +7143,7 @@ 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 7094 "ConfigurationInterfaces.c"
+#line 7142 "ConfigurationInterfaces.c"
 }
 
 
@@ -7119,7 +7167,7 @@ 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 7118 "ConfigurationInterfaces.c"
+#line 7166 "ConfigurationInterfaces.c"
 				goto __catch141_configuration_error;
 			}
 #line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7128,7 +7176,7 @@ 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 7127 "ConfigurationInterfaces.c"
+#line 7175 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally141;
@@ -7146,7 +7194,7 @@ 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 7145 "ConfigurationInterfaces.c"
+#line 7193 "ConfigurationInterfaces.c"
 	}
 	__finally141:
 #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7157,7 +7205,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 7156 "ConfigurationInterfaces.c"
+#line 7204 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7167,7 +7215,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 7166 "ConfigurationInterfaces.c"
+#line 7214 "ConfigurationInterfaces.c"
 }
 
 
@@ -7197,7 +7245,7 @@ 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 7196 "ConfigurationInterfaces.c"
+#line 7244 "ConfigurationInterfaces.c"
 				goto __catch142_configuration_error;
 			}
 #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7206,7 +7254,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 7205 "ConfigurationInterfaces.c"
+#line 7253 "ConfigurationInterfaces.c"
 		}
 #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -7218,7 +7266,7 @@ 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 7217 "ConfigurationInterfaces.c"
+#line 7265 "ConfigurationInterfaces.c"
 	}
 	goto __finally142;
 	__catch142_configuration_error:
@@ -7242,7 +7290,7 @@ 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 7241 "ConfigurationInterfaces.c"
+#line 7289 "ConfigurationInterfaces.c"
 	}
 	__finally142:
 #line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7251,7 +7299,7 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel
 	g_clear_error (&_inner_error_);
 #line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 7250 "ConfigurationInterfaces.c"
+#line 7298 "ConfigurationInterfaces.c"
 }
 
 
@@ -7260,7 +7308,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 7259 "ConfigurationInterfaces.c"
+#line 7307 "ConfigurationInterfaces.c"
 }
 
 
@@ -7268,7 +7316,7 @@ 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 7267 "ConfigurationInterfaces.c"
+#line 7315 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -7287,7 +7335,7 @@ 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 7286 "ConfigurationInterfaces.c"
+#line 7334 "ConfigurationInterfaces.c"
 				goto __catch143_configuration_error;
 			}
 #line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7296,7 +7344,7 @@ 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 7295 "ConfigurationInterfaces.c"
+#line 7343 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally143;
@@ -7314,7 +7362,7 @@ 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 7313 "ConfigurationInterfaces.c"
+#line 7361 "ConfigurationInterfaces.c"
 	}
 	__finally143:
 #line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7325,7 +7373,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 7324 "ConfigurationInterfaces.c"
+#line 7372 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7335,12 +7383,13 @@ 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 7334 "ConfigurationInterfaces.c"
+#line 7382 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -7362,9 +7411,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7363 "ConfigurationInterfaces.c"
+#line 7414 "ConfigurationInterfaces.c"
 				goto __catch144_configuration_error;
 			}
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7372,35 +7423,35 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 7372 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 7423 "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 7378 "ConfigurationInterfaces.c"
+#line 7429 "ConfigurationInterfaces.c"
 	}
 	goto __finally144;
 	__catch144_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1096 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1096 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1098 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
 #line 1098 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1098 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7399 "ConfigurationInterfaces.c"
+#line 7450 "ConfigurationInterfaces.c"
 	}
 	__finally144:
 #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7408,8 +7459,8 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca
 #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 FALSE;
-#line 7408 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 7459 "ConfigurationInterfaces.c"
 }
 
 
@@ -7418,7 +7469,7 @@ 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 7417 "ConfigurationInterfaces.c"
+#line 7468 "ConfigurationInterfaces.c"
 }
 
 
@@ -7442,7 +7493,7 @@ 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 7441 "ConfigurationInterfaces.c"
+#line 7492 "ConfigurationInterfaces.c"
 				goto __catch145_configuration_error;
 			}
 #line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7451,7 +7502,7 @@ 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 7450 "ConfigurationInterfaces.c"
+#line 7501 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally145;
@@ -7469,7 +7520,7 @@ 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 7468 "ConfigurationInterfaces.c"
+#line 7519 "ConfigurationInterfaces.c"
 	}
 	__finally145:
 #line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7480,7 +7531,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 7479 "ConfigurationInterfaces.c"
+#line 7530 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7490,12 +7541,13 @@ 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 7489 "ConfigurationInterfaces.c"
+#line 7540 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -7517,9 +7569,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7518 "ConfigurationInterfaces.c"
+#line 7572 "ConfigurationInterfaces.c"
 				goto __catch146_configuration_error;
 			}
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7527,35 +7581,35 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 7527 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 7581 "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 7533 "ConfigurationInterfaces.c"
+#line 7587 "ConfigurationInterfaces.c"
 	}
 	goto __finally146;
 	__catch146_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1118 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
 #line 1118 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1118 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7554 "ConfigurationInterfaces.c"
+#line 7608 "ConfigurationInterfaces.c"
 	}
 	__finally146:
 #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7563,8 +7617,8 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa
 #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 FALSE;
-#line 7563 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 7617 "ConfigurationInterfaces.c"
 }
 
 
@@ -7573,7 +7627,7 @@ 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 7572 "ConfigurationInterfaces.c"
+#line 7626 "ConfigurationInterfaces.c"
 }
 
 
@@ -7597,7 +7651,7 @@ 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 7596 "ConfigurationInterfaces.c"
+#line 7650 "ConfigurationInterfaces.c"
 				goto __catch147_configuration_error;
 			}
 #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7606,7 +7660,7 @@ 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 7605 "ConfigurationInterfaces.c"
+#line 7659 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally147;
@@ -7624,7 +7678,7 @@ 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 7623 "ConfigurationInterfaces.c"
+#line 7677 "ConfigurationInterfaces.c"
 	}
 	__finally147:
 #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7635,7 +7689,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 7634 "ConfigurationInterfaces.c"
+#line 7688 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7645,12 +7699,13 @@ 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 7644 "ConfigurationInterfaces.c"
+#line 7698 "ConfigurationInterfaces.c"
 }
 
 
 static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade* self) {
 	gint result = 0;
+	gint _tmp7_ = 0;
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
@@ -7672,9 +7727,11 @@ 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"
+			gint _tmp5_ = 0;
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7673 "ConfigurationInterfaces.c"
+#line 7730 "ConfigurationInterfaces.c"
 				goto __catch148_configuration_error;
 			}
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7682,35 +7739,35 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade*
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return 0;
-#line 7682 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 7739 "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 7688 "ConfigurationInterfaces.c"
+#line 7745 "ConfigurationInterfaces.c"
 	}
 	goto __finally148;
 	__catch148_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1137 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1137 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 1;
 #line 1138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7709 "ConfigurationInterfaces.c"
+#line 7766 "ConfigurationInterfaces.c"
 	}
 	__finally148:
 #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7718,8 +7775,8 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade*
 #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 0;
-#line 7718 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 7775 "ConfigurationInterfaces.c"
 }
 
 
@@ -7728,7 +7785,7 @@ 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 7727 "ConfigurationInterfaces.c"
+#line 7784 "ConfigurationInterfaces.c"
 }
 
 
@@ -7752,7 +7809,7 @@ 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 7751 "ConfigurationInterfaces.c"
+#line 7808 "ConfigurationInterfaces.c"
 				goto __catch149_configuration_error;
 			}
 #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7761,7 +7818,7 @@ 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 7760 "ConfigurationInterfaces.c"
+#line 7817 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally149;
@@ -7779,7 +7836,7 @@ 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 7778 "ConfigurationInterfaces.c"
+#line 7835 "ConfigurationInterfaces.c"
 	}
 	__finally149:
 #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7790,7 +7847,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 7789 "ConfigurationInterfaces.c"
+#line 7846 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7800,12 +7857,13 @@ 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 7799 "ConfigurationInterfaces.c"
+#line 7856 "ConfigurationInterfaces.c"
 }
 
 
 static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFacade* self) {
 	gint result = 0;
+	gint _tmp7_ = 0;
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
@@ -7827,9 +7885,11 @@ 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"
+			gint _tmp5_ = 0;
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7828 "ConfigurationInterfaces.c"
+#line 7888 "ConfigurationInterfaces.c"
 				goto __catch150_configuration_error;
 			}
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7837,35 +7897,35 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return 0;
-#line 7837 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 7897 "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 7843 "ConfigurationInterfaces.c"
+#line 7903 "ConfigurationInterfaces.c"
 	}
 	goto __finally150;
 	__catch150_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1157 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1157 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
 #line 1162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7864 "ConfigurationInterfaces.c"
+#line 7924 "ConfigurationInterfaces.c"
 	}
 	__finally150:
 #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7873,8 +7933,8 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa
 #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 0;
-#line 7873 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 7933 "ConfigurationInterfaces.c"
 }
 
 
@@ -7883,7 +7943,7 @@ 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 7882 "ConfigurationInterfaces.c"
+#line 7942 "ConfigurationInterfaces.c"
 }
 
 
@@ -7907,7 +7967,7 @@ 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 7906 "ConfigurationInterfaces.c"
+#line 7966 "ConfigurationInterfaces.c"
 				goto __catch151_configuration_error;
 			}
 #line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7916,7 +7976,7 @@ 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 7915 "ConfigurationInterfaces.c"
+#line 7975 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally151;
@@ -7934,7 +7994,7 @@ 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 7933 "ConfigurationInterfaces.c"
+#line 7993 "ConfigurationInterfaces.c"
 	}
 	__finally151:
 #line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7945,7 +8005,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 7944 "ConfigurationInterfaces.c"
+#line 8004 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7955,12 +8015,13 @@ 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 7954 "ConfigurationInterfaces.c"
+#line 8014 "ConfigurationInterfaces.c"
 }
 
 
 static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade* self) {
 	gint result = 0;
+	gint _tmp7_ = 0;
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
@@ -7982,9 +8043,11 @@ 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"
+			gint _tmp5_ = 0;
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7983 "ConfigurationInterfaces.c"
+#line 8046 "ConfigurationInterfaces.c"
 				goto __catch152_configuration_error;
 			}
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7992,35 +8055,35 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade*
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return 0;
-#line 7992 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 8055 "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 7998 "ConfigurationInterfaces.c"
+#line 8061 "ConfigurationInterfaces.c"
 	}
 	goto __finally152;
 	__catch152_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1181 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1181 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 1;
 #line 1182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8019 "ConfigurationInterfaces.c"
+#line 8082 "ConfigurationInterfaces.c"
 	}
 	__finally152:
 #line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8028,8 +8091,8 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade*
 #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 0;
-#line 8028 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 8091 "ConfigurationInterfaces.c"
 }
 
 
@@ -8038,7 +8101,7 @@ 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 8037 "ConfigurationInterfaces.c"
+#line 8100 "ConfigurationInterfaces.c"
 }
 
 
@@ -8062,7 +8125,7 @@ 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 8061 "ConfigurationInterfaces.c"
+#line 8124 "ConfigurationInterfaces.c"
 				goto __catch153_configuration_error;
 			}
 #line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8071,7 +8134,7 @@ 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 8070 "ConfigurationInterfaces.c"
+#line 8133 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally153;
@@ -8089,7 +8152,7 @@ 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 8088 "ConfigurationInterfaces.c"
+#line 8151 "ConfigurationInterfaces.c"
 	}
 	__finally153:
 #line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8100,7 +8163,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 8099 "ConfigurationInterfaces.c"
+#line 8162 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8110,7 +8173,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 8109 "ConfigurationInterfaces.c"
+#line 8172 "ConfigurationInterfaces.c"
 }
 
 
@@ -8140,7 +8203,7 @@ 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 8139 "ConfigurationInterfaces.c"
+#line 8202 "ConfigurationInterfaces.c"
 				goto __catch154_configuration_error;
 			}
 #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8149,7 +8212,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 8148 "ConfigurationInterfaces.c"
+#line 8211 "ConfigurationInterfaces.c"
 		}
 #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -8161,7 +8224,7 @@ 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 8160 "ConfigurationInterfaces.c"
+#line 8223 "ConfigurationInterfaces.c"
 	}
 	goto __finally154;
 	__catch154_configuration_error:
@@ -8185,7 +8248,7 @@ 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 8184 "ConfigurationInterfaces.c"
+#line 8247 "ConfigurationInterfaces.c"
 	}
 	__finally154:
 #line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8194,7 +8257,7 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca
 	g_clear_error (&_inner_error_);
 #line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 8193 "ConfigurationInterfaces.c"
+#line 8256 "ConfigurationInterfaces.c"
 }
 
 
@@ -8203,7 +8266,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 8202 "ConfigurationInterfaces.c"
+#line 8265 "ConfigurationInterfaces.c"
 }
 
 
@@ -8211,7 +8274,7 @@ 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 8210 "ConfigurationInterfaces.c"
+#line 8273 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -8230,7 +8293,7 @@ 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 8229 "ConfigurationInterfaces.c"
+#line 8292 "ConfigurationInterfaces.c"
 				goto __catch155_configuration_error;
 			}
 #line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8239,7 +8302,7 @@ 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 8238 "ConfigurationInterfaces.c"
+#line 8301 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally155;
@@ -8257,7 +8320,7 @@ 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 8256 "ConfigurationInterfaces.c"
+#line 8319 "ConfigurationInterfaces.c"
 	}
 	__finally155:
 #line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8268,7 +8331,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 8267 "ConfigurationInterfaces.c"
+#line 8330 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8278,7 +8341,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 8277 "ConfigurationInterfaces.c"
+#line 8340 "ConfigurationInterfaces.c"
 }
 
 
@@ -8308,7 +8371,7 @@ 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 8307 "ConfigurationInterfaces.c"
+#line 8370 "ConfigurationInterfaces.c"
 				goto __catch156_configuration_error;
 			}
 #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8317,7 +8380,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 8316 "ConfigurationInterfaces.c"
+#line 8379 "ConfigurationInterfaces.c"
 		}
 #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -8329,7 +8392,7 @@ 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 8328 "ConfigurationInterfaces.c"
+#line 8391 "ConfigurationInterfaces.c"
 	}
 	goto __finally156;
 	__catch156_configuration_error:
@@ -8353,7 +8416,7 @@ 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 8352 "ConfigurationInterfaces.c"
+#line 8415 "ConfigurationInterfaces.c"
 	}
 	__finally156:
 #line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8362,7 +8425,7 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi
 	g_clear_error (&_inner_error_);
 #line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 8361 "ConfigurationInterfaces.c"
+#line 8424 "ConfigurationInterfaces.c"
 }
 
 
@@ -8371,7 +8434,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 8370 "ConfigurationInterfaces.c"
+#line 8433 "ConfigurationInterfaces.c"
 }
 
 
@@ -8379,7 +8442,7 @@ 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 8378 "ConfigurationInterfaces.c"
+#line 8441 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -8398,7 +8461,7 @@ 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 8397 "ConfigurationInterfaces.c"
+#line 8460 "ConfigurationInterfaces.c"
 				goto __catch157_configuration_error;
 			}
 #line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8407,7 +8470,7 @@ 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 8406 "ConfigurationInterfaces.c"
+#line 8469 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally157;
@@ -8425,7 +8488,7 @@ 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 8424 "ConfigurationInterfaces.c"
+#line 8487 "ConfigurationInterfaces.c"
 	}
 	__finally157:
 #line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8436,7 +8499,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 8435 "ConfigurationInterfaces.c"
+#line 8498 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8446,7 +8509,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 8445 "ConfigurationInterfaces.c"
+#line 8508 "ConfigurationInterfaces.c"
 }
 
 
@@ -8458,7 +8521,7 @@ 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 8457 "ConfigurationInterfaces.c"
+#line 8520 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -8486,7 +8549,7 @@ 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 8485 "ConfigurationInterfaces.c"
+#line 8548 "ConfigurationInterfaces.c"
 				goto __catch158_configuration_error;
 			}
 #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8495,7 +8558,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 8494 "ConfigurationInterfaces.c"
+#line 8557 "ConfigurationInterfaces.c"
 		}
 #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_order = _tmp0_;
@@ -8515,7 +8578,7 @@ 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 8514 "ConfigurationInterfaces.c"
+#line 8577 "ConfigurationInterfaces.c"
 				goto __catch158_configuration_error;
 			}
 #line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8524,11 +8587,11 @@ 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 8523 "ConfigurationInterfaces.c"
+#line 8586 "ConfigurationInterfaces.c"
 		}
 #line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_by = _tmp5_;
-#line 8527 "ConfigurationInterfaces.c"
+#line 8590 "ConfigurationInterfaces.c"
 	}
 	goto __finally158;
 	__catch158_configuration_error:
@@ -8545,7 +8608,7 @@ 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 8544 "ConfigurationInterfaces.c"
+#line 8607 "ConfigurationInterfaces.c"
 	}
 	__finally158:
 #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8556,19 +8619,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 8555 "ConfigurationInterfaces.c"
+#line 8618 "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 8561 "ConfigurationInterfaces.c"
+#line 8624 "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 8567 "ConfigurationInterfaces.c"
+#line 8630 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8578,7 +8641,7 @@ 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 8577 "ConfigurationInterfaces.c"
+#line 8640 "ConfigurationInterfaces.c"
 }
 
 
@@ -8605,7 +8668,7 @@ 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 8604 "ConfigurationInterfaces.c"
+#line 8667 "ConfigurationInterfaces.c"
 				goto __catch159_configuration_error;
 			}
 #line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8614,7 +8677,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 8613 "ConfigurationInterfaces.c"
+#line 8676 "ConfigurationInterfaces.c"
 		}
 #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -8630,7 +8693,7 @@ 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 8629 "ConfigurationInterfaces.c"
+#line 8692 "ConfigurationInterfaces.c"
 				goto __catch159_configuration_error;
 			}
 #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8639,7 +8702,7 @@ 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 8638 "ConfigurationInterfaces.c"
+#line 8701 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally159;
@@ -8657,7 +8720,7 @@ 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 8656 "ConfigurationInterfaces.c"
+#line 8719 "ConfigurationInterfaces.c"
 	}
 	__finally159:
 #line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8668,7 +8731,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 8667 "ConfigurationInterfaces.c"
+#line 8730 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8678,7 +8741,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 8677 "ConfigurationInterfaces.c"
+#line 8740 "ConfigurationInterfaces.c"
 }
 
 
@@ -8690,7 +8753,7 @@ 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 8689 "ConfigurationInterfaces.c"
+#line 8752 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -8725,7 +8788,7 @@ 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 8724 "ConfigurationInterfaces.c"
+#line 8787 "ConfigurationInterfaces.c"
 				goto __catch160_configuration_error;
 			}
 #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8734,7 +8797,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 8733 "ConfigurationInterfaces.c"
+#line 8796 "ConfigurationInterfaces.c"
 		}
 #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_maximize = _tmp0_;
@@ -8754,7 +8817,7 @@ 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 8753 "ConfigurationInterfaces.c"
+#line 8816 "ConfigurationInterfaces.c"
 				goto __catch160_configuration_error;
 			}
 #line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8763,7 +8826,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 8762 "ConfigurationInterfaces.c"
+#line 8825 "ConfigurationInterfaces.c"
 		}
 #line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = configuration_facade_get_engine (self);
@@ -8781,7 +8844,7 @@ 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 8780 "ConfigurationInterfaces.c"
+#line 8843 "ConfigurationInterfaces.c"
 				goto __catch160_configuration_error;
 			}
 #line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8790,7 +8853,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 8789 "ConfigurationInterfaces.c"
+#line 8852 "ConfigurationInterfaces.c"
 		}
 #line 1278 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp13_ = w;
@@ -8798,7 +8861,7 @@ 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 8797 "ConfigurationInterfaces.c"
+#line 8860 "ConfigurationInterfaces.c"
 	}
 	goto __finally160;
 	__catch160_configuration_error:
@@ -8815,7 +8878,7 @@ 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 8814 "ConfigurationInterfaces.c"
+#line 8877 "ConfigurationInterfaces.c"
 	}
 	__finally160:
 #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8826,19 +8889,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 8825 "ConfigurationInterfaces.c"
+#line 8888 "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 8831 "ConfigurationInterfaces.c"
+#line 8894 "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 8837 "ConfigurationInterfaces.c"
+#line 8900 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8848,7 +8911,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 8847 "ConfigurationInterfaces.c"
+#line 8910 "ConfigurationInterfaces.c"
 }
 
 
@@ -8856,7 +8919,7 @@ 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 8855 "ConfigurationInterfaces.c"
+#line 8918 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -8883,7 +8946,7 @@ 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 8882 "ConfigurationInterfaces.c"
+#line 8945 "ConfigurationInterfaces.c"
 				goto __catch161_configuration_error;
 			}
 #line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8892,7 +8955,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 8891 "ConfigurationInterfaces.c"
+#line 8954 "ConfigurationInterfaces.c"
 		}
 #line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -8910,7 +8973,7 @@ 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 8909 "ConfigurationInterfaces.c"
+#line 8972 "ConfigurationInterfaces.c"
 				goto __catch161_configuration_error;
 			}
 #line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8919,7 +8982,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 8918 "ConfigurationInterfaces.c"
+#line 8981 "ConfigurationInterfaces.c"
 		}
 #line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = configuration_facade_get_engine (self);
@@ -8937,7 +9000,7 @@ 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 8936 "ConfigurationInterfaces.c"
+#line 8999 "ConfigurationInterfaces.c"
 				goto __catch161_configuration_error;
 			}
 #line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8946,7 +9009,7 @@ 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 8945 "ConfigurationInterfaces.c"
+#line 9008 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally161;
@@ -8964,7 +9027,7 @@ 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 8963 "ConfigurationInterfaces.c"
+#line 9026 "ConfigurationInterfaces.c"
 	}
 	__finally161:
 #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8975,7 +9038,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 8974 "ConfigurationInterfaces.c"
+#line 9037 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8985,12 +9048,13 @@ 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 8984 "ConfigurationInterfaces.c"
+#line 9047 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_modify_originals (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -9012,9 +9076,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9013 "ConfigurationInterfaces.c"
+#line 9079 "ConfigurationInterfaces.c"
 				goto __catch162_configuration_error;
 			}
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9022,35 +9088,35 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 9022 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 9088 "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 9028 "ConfigurationInterfaces.c"
+#line 9094 "ConfigurationInterfaces.c"
 	}
 	goto __finally162;
 	__catch162_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1303 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1303 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
 #line 1306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9049 "ConfigurationInterfaces.c"
+#line 9115 "ConfigurationInterfaces.c"
 	}
 	__finally162:
 #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9058,8 +9124,8 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac
 #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 FALSE;
-#line 9058 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 9124 "ConfigurationInterfaces.c"
 }
 
 
@@ -9068,7 +9134,7 @@ 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 9067 "ConfigurationInterfaces.c"
+#line 9133 "ConfigurationInterfaces.c"
 }
 
 
@@ -9092,7 +9158,7 @@ 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 9091 "ConfigurationInterfaces.c"
+#line 9157 "ConfigurationInterfaces.c"
 				goto __catch163_configuration_error;
 			}
 #line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9101,7 +9167,7 @@ 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 9100 "ConfigurationInterfaces.c"
+#line 9166 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally163;
@@ -9119,7 +9185,7 @@ 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 9118 "ConfigurationInterfaces.c"
+#line 9184 "ConfigurationInterfaces.c"
 	}
 	__finally163:
 #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9130,7 +9196,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 9129 "ConfigurationInterfaces.c"
+#line 9195 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9140,12 +9206,13 @@ 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 9139 "ConfigurationInterfaces.c"
+#line 9205 "ConfigurationInterfaces.c"
 }
 
 
 static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFacade* self) {
 	gint result = 0;
+	gint _tmp9_ = 0;
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
@@ -9167,9 +9234,11 @@ 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"
+			gint _tmp5_ = 0;
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9168 "ConfigurationInterfaces.c"
+#line 9237 "ConfigurationInterfaces.c"
 				goto __catch164_configuration_error;
 			}
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9177,41 +9246,41 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return 0;
-#line 9177 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 9246 "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 9183 "ConfigurationInterfaces.c"
+#line 9252 "ConfigurationInterfaces.c"
 	}
 	goto __finally164;
 	__catch164_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
+		GError* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
+		gint _tmp8_ = 0;
 #line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1325 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1325 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp6_ = thumbnail_get_DEFAULT_SCALE ();
+		_tmp7_ = thumbnail_get_DEFAULT_SCALE ();
 #line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp7_ = _tmp6_;
+		_tmp8_ = _tmp7_;
 #line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		result = _tmp7_;
+		result = _tmp8_;
 #line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9210 "ConfigurationInterfaces.c"
+#line 9279 "ConfigurationInterfaces.c"
 	}
 	__finally164:
 #line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9219,8 +9288,8 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa
 #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 0;
-#line 9219 "ConfigurationInterfaces.c"
+	return _tmp9_;
+#line 9288 "ConfigurationInterfaces.c"
 }
 
 
@@ -9229,7 +9298,7 @@ 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 9228 "ConfigurationInterfaces.c"
+#line 9297 "ConfigurationInterfaces.c"
 }
 
 
@@ -9253,7 +9322,7 @@ 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 9252 "ConfigurationInterfaces.c"
+#line 9321 "ConfigurationInterfaces.c"
 				goto __catch165_configuration_error;
 			}
 #line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9262,7 +9331,7 @@ 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 9261 "ConfigurationInterfaces.c"
+#line 9330 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally165;
@@ -9280,7 +9349,7 @@ 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 9279 "ConfigurationInterfaces.c"
+#line 9348 "ConfigurationInterfaces.c"
 	}
 	__finally165:
 #line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9291,7 +9360,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 9290 "ConfigurationInterfaces.c"
+#line 9359 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9301,12 +9370,13 @@ 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 9300 "ConfigurationInterfaces.c"
+#line 9369 "ConfigurationInterfaces.c"
 }
 
 
 static gdouble configuration_facade_real_get_printing_content_height (ConfigurationFacade* self) {
 	gdouble result = 0.0;
+	gdouble _tmp7_ = 0.0;
 	GError * _inner_error_ = NULL;
 	{
 		gdouble _tmp0_ = 0.0;
@@ -9328,9 +9398,11 @@ 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"
+			gdouble _tmp5_ = 0.0;
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9329 "ConfigurationInterfaces.c"
+#line 9401 "ConfigurationInterfaces.c"
 				goto __catch166_configuration_error;
 			}
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9338,35 +9410,35 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return 0.0;
-#line 9338 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 9410 "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 9344 "ConfigurationInterfaces.c"
+#line 9416 "ConfigurationInterfaces.c"
 	}
 	goto __finally166;
 	__catch166_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 5.0;
 #line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9365 "ConfigurationInterfaces.c"
+#line 9437 "ConfigurationInterfaces.c"
 	}
 	__finally166:
 #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9374,8 +9446,8 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat
 #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 0.0;
-#line 9374 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 9446 "ConfigurationInterfaces.c"
 }
 
 
@@ -9384,7 +9456,7 @@ 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 9383 "ConfigurationInterfaces.c"
+#line 9455 "ConfigurationInterfaces.c"
 }
 
 
@@ -9408,7 +9480,7 @@ 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 9407 "ConfigurationInterfaces.c"
+#line 9479 "ConfigurationInterfaces.c"
 				goto __catch167_configuration_error;
 			}
 #line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9417,7 +9489,7 @@ 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 9416 "ConfigurationInterfaces.c"
+#line 9488 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally167;
@@ -9435,7 +9507,7 @@ 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 9434 "ConfigurationInterfaces.c"
+#line 9506 "ConfigurationInterfaces.c"
 	}
 	__finally167:
 #line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9446,7 +9518,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 9445 "ConfigurationInterfaces.c"
+#line 9517 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9456,12 +9528,13 @@ 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 9455 "ConfigurationInterfaces.c"
+#line 9527 "ConfigurationInterfaces.c"
 }
 
 
 static gint configuration_facade_real_get_printing_content_layout (ConfigurationFacade* self) {
 	gint result = 0;
+	gint _tmp7_ = 0;
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
@@ -9483,9 +9556,11 @@ 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"
+			gint _tmp5_ = 0;
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9484 "ConfigurationInterfaces.c"
+#line 9559 "ConfigurationInterfaces.c"
 				goto __catch168_configuration_error;
 			}
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9493,35 +9568,35 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return 0;
-#line 9493 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 9568 "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 9499 "ConfigurationInterfaces.c"
+#line 9574 "ConfigurationInterfaces.c"
 	}
 	goto __finally168;
 	__catch168_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1367 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1367 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1369 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
 #line 1369 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1369 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9520 "ConfigurationInterfaces.c"
+#line 9595 "ConfigurationInterfaces.c"
 	}
 	__finally168:
 #line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9529,8 +9604,8 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration
 #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 0;
-#line 9529 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 9604 "ConfigurationInterfaces.c"
 }
 
 
@@ -9539,7 +9614,7 @@ 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 9538 "ConfigurationInterfaces.c"
+#line 9613 "ConfigurationInterfaces.c"
 }
 
 
@@ -9563,7 +9638,7 @@ 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 9562 "ConfigurationInterfaces.c"
+#line 9637 "ConfigurationInterfaces.c"
 				goto __catch169_configuration_error;
 			}
 #line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9572,7 +9647,7 @@ 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 9571 "ConfigurationInterfaces.c"
+#line 9646 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally169;
@@ -9590,7 +9665,7 @@ 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 9589 "ConfigurationInterfaces.c"
+#line 9664 "ConfigurationInterfaces.c"
 	}
 	__finally169:
 #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9601,7 +9676,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 9600 "ConfigurationInterfaces.c"
+#line 9675 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9611,12 +9686,13 @@ 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 9610 "ConfigurationInterfaces.c"
+#line 9685 "ConfigurationInterfaces.c"
 }
 
 
 static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFacade* self) {
 	gint result = 0;
+	gint _tmp7_ = 0;
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
@@ -9638,9 +9714,11 @@ 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"
+			gint _tmp5_ = 0;
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9639 "ConfigurationInterfaces.c"
+#line 9717 "ConfigurationInterfaces.c"
 				goto __catch170_configuration_error;
 			}
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9648,35 +9726,35 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return 0;
-#line 9648 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 9726 "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 9654 "ConfigurationInterfaces.c"
+#line 9732 "ConfigurationInterfaces.c"
 	}
 	goto __finally170;
 	__catch170_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1389 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1389 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1391 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 600;
 #line 1391 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1391 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9675 "ConfigurationInterfaces.c"
+#line 9753 "ConfigurationInterfaces.c"
 	}
 	__finally170:
 #line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9684,8 +9762,8 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac
 #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 0;
-#line 9684 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 9762 "ConfigurationInterfaces.c"
 }
 
 
@@ -9694,7 +9772,7 @@ 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 9693 "ConfigurationInterfaces.c"
+#line 9771 "ConfigurationInterfaces.c"
 }
 
 
@@ -9718,7 +9796,7 @@ 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 9717 "ConfigurationInterfaces.c"
+#line 9795 "ConfigurationInterfaces.c"
 				goto __catch171_configuration_error;
 			}
 #line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9727,7 +9805,7 @@ 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 9726 "ConfigurationInterfaces.c"
+#line 9804 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally171;
@@ -9745,7 +9823,7 @@ 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 9744 "ConfigurationInterfaces.c"
+#line 9822 "ConfigurationInterfaces.c"
 	}
 	__finally171:
 #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9756,7 +9834,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 9755 "ConfigurationInterfaces.c"
+#line 9833 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9766,12 +9844,13 @@ 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 9765 "ConfigurationInterfaces.c"
+#line 9843 "ConfigurationInterfaces.c"
 }
 
 
 static gint configuration_facade_real_get_printing_content_units (ConfigurationFacade* self) {
 	gint result = 0;
+	gint _tmp7_ = 0;
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
@@ -9793,9 +9872,11 @@ 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"
+			gint _tmp5_ = 0;
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9794 "ConfigurationInterfaces.c"
+#line 9875 "ConfigurationInterfaces.c"
 				goto __catch172_configuration_error;
 			}
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9803,35 +9884,35 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return 0;
-#line 9803 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 9884 "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 9809 "ConfigurationInterfaces.c"
+#line 9890 "ConfigurationInterfaces.c"
 	}
 	goto __finally172;
 	__catch172_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1410 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1410 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1412 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
 #line 1412 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1412 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9830 "ConfigurationInterfaces.c"
+#line 9911 "ConfigurationInterfaces.c"
 	}
 	__finally172:
 #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9839,8 +9920,8 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF
 #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 0;
-#line 9839 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 9920 "ConfigurationInterfaces.c"
 }
 
 
@@ -9849,7 +9930,7 @@ 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 9848 "ConfigurationInterfaces.c"
+#line 9929 "ConfigurationInterfaces.c"
 }
 
 
@@ -9873,7 +9954,7 @@ 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 9872 "ConfigurationInterfaces.c"
+#line 9953 "ConfigurationInterfaces.c"
 				goto __catch173_configuration_error;
 			}
 #line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9882,7 +9963,7 @@ 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 9881 "ConfigurationInterfaces.c"
+#line 9962 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally173;
@@ -9900,7 +9981,7 @@ 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 9899 "ConfigurationInterfaces.c"
+#line 9980 "ConfigurationInterfaces.c"
 	}
 	__finally173:
 #line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9911,7 +9992,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 9910 "ConfigurationInterfaces.c"
+#line 9991 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9921,12 +10002,13 @@ 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 9920 "ConfigurationInterfaces.c"
+#line 10001 "ConfigurationInterfaces.c"
 }
 
 
 static gdouble configuration_facade_real_get_printing_content_width (ConfigurationFacade* self) {
 	gdouble result = 0.0;
+	gdouble _tmp7_ = 0.0;
 	GError * _inner_error_ = NULL;
 	{
 		gdouble _tmp0_ = 0.0;
@@ -9948,9 +10030,11 @@ 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"
+			gdouble _tmp5_ = 0.0;
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9949 "ConfigurationInterfaces.c"
+#line 10033 "ConfigurationInterfaces.c"
 				goto __catch174_configuration_error;
 			}
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9958,35 +10042,35 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return 0.0;
-#line 9958 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 10042 "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 9964 "ConfigurationInterfaces.c"
+#line 10048 "ConfigurationInterfaces.c"
 	}
 	goto __finally174;
 	__catch174_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1434 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 7.0;
 #line 1434 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1434 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9985 "ConfigurationInterfaces.c"
+#line 10069 "ConfigurationInterfaces.c"
 	}
 	__finally174:
 #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9994,8 +10078,8 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati
 #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 0.0;
-#line 9994 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 10078 "ConfigurationInterfaces.c"
 }
 
 
@@ -10004,7 +10088,7 @@ 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 10003 "ConfigurationInterfaces.c"
+#line 10087 "ConfigurationInterfaces.c"
 }
 
 
@@ -10028,7 +10112,7 @@ 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 10027 "ConfigurationInterfaces.c"
+#line 10111 "ConfigurationInterfaces.c"
 				goto __catch175_configuration_error;
 			}
 #line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10037,7 +10121,7 @@ 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 10036 "ConfigurationInterfaces.c"
+#line 10120 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally175;
@@ -10055,7 +10139,7 @@ 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 10054 "ConfigurationInterfaces.c"
+#line 10138 "ConfigurationInterfaces.c"
 	}
 	__finally175:
 #line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10066,7 +10150,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 10065 "ConfigurationInterfaces.c"
+#line 10149 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -10076,12 +10160,13 @@ 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 10075 "ConfigurationInterfaces.c"
+#line 10159 "ConfigurationInterfaces.c"
 }
 
 
 static gint configuration_facade_real_get_printing_images_per_page (ConfigurationFacade* self) {
 	gint result = 0;
+	gint _tmp7_ = 0;
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
@@ -10103,9 +10188,11 @@ 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"
+			gint _tmp5_ = 0;
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10104 "ConfigurationInterfaces.c"
+#line 10191 "ConfigurationInterfaces.c"
 				goto __catch176_configuration_error;
 			}
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10113,35 +10200,35 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return 0;
-#line 10113 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 10200 "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 10119 "ConfigurationInterfaces.c"
+#line 10206 "ConfigurationInterfaces.c"
 	}
 	goto __finally176;
 	__catch176_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1454 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1454 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
 #line 1456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10140 "ConfigurationInterfaces.c"
+#line 10227 "ConfigurationInterfaces.c"
 	}
 	__finally176:
 #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10149,8 +10236,8 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio
 #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 0;
-#line 10149 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 10236 "ConfigurationInterfaces.c"
 }
 
 
@@ -10159,7 +10246,7 @@ 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 10158 "ConfigurationInterfaces.c"
+#line 10245 "ConfigurationInterfaces.c"
 }
 
 
@@ -10183,7 +10270,7 @@ 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 10182 "ConfigurationInterfaces.c"
+#line 10269 "ConfigurationInterfaces.c"
 				goto __catch177_configuration_error;
 			}
 #line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10192,7 +10279,7 @@ 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 10191 "ConfigurationInterfaces.c"
+#line 10278 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally177;
@@ -10210,7 +10297,7 @@ 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 10209 "ConfigurationInterfaces.c"
+#line 10296 "ConfigurationInterfaces.c"
 	}
 	__finally177:
 #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10221,7 +10308,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 10220 "ConfigurationInterfaces.c"
+#line 10307 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -10231,12 +10318,13 @@ 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 10230 "ConfigurationInterfaces.c"
+#line 10317 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_printing_match_aspect_ratio (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -10258,9 +10346,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10259 "ConfigurationInterfaces.c"
+#line 10349 "ConfigurationInterfaces.c"
 				goto __catch178_configuration_error;
 			}
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10268,35 +10358,35 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 10268 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 10358 "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 10274 "ConfigurationInterfaces.c"
+#line 10364 "ConfigurationInterfaces.c"
 	}
 	goto __finally178;
 	__catch178_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1476 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1476 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
 #line 1478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10295 "ConfigurationInterfaces.c"
+#line 10385 "ConfigurationInterfaces.c"
 	}
 	__finally178:
 #line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10304,8 +10394,8 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi
 #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 FALSE;
-#line 10304 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 10394 "ConfigurationInterfaces.c"
 }
 
 
@@ -10314,7 +10404,7 @@ 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 10313 "ConfigurationInterfaces.c"
+#line 10403 "ConfigurationInterfaces.c"
 }
 
 
@@ -10338,7 +10428,7 @@ 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 10337 "ConfigurationInterfaces.c"
+#line 10427 "ConfigurationInterfaces.c"
 				goto __catch179_configuration_error;
 			}
 #line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10347,7 +10437,7 @@ 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 10346 "ConfigurationInterfaces.c"
+#line 10436 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally179;
@@ -10365,7 +10455,7 @@ 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 10364 "ConfigurationInterfaces.c"
+#line 10454 "ConfigurationInterfaces.c"
 	}
 	__finally179:
 #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10376,7 +10466,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 10375 "ConfigurationInterfaces.c"
+#line 10465 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -10386,12 +10476,13 @@ 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 10385 "ConfigurationInterfaces.c"
+#line 10475 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_printing_print_titles (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -10413,9 +10504,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10414 "ConfigurationInterfaces.c"
+#line 10507 "ConfigurationInterfaces.c"
 				goto __catch180_configuration_error;
 			}
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10423,35 +10516,35 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 10423 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 10516 "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 10429 "ConfigurationInterfaces.c"
+#line 10522 "ConfigurationInterfaces.c"
 	}
 	goto __finally180;
 	__catch180_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1498 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1498 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
 #line 1500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10450 "ConfigurationInterfaces.c"
+#line 10543 "ConfigurationInterfaces.c"
 	}
 	__finally180:
 #line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10459,8 +10552,8 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati
 #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 FALSE;
-#line 10459 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 10552 "ConfigurationInterfaces.c"
 }
 
 
@@ -10469,7 +10562,7 @@ 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 10468 "ConfigurationInterfaces.c"
+#line 10561 "ConfigurationInterfaces.c"
 }
 
 
@@ -10493,7 +10586,7 @@ 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 10492 "ConfigurationInterfaces.c"
+#line 10585 "ConfigurationInterfaces.c"
 				goto __catch181_configuration_error;
 			}
 #line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10502,7 +10595,7 @@ 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 10501 "ConfigurationInterfaces.c"
+#line 10594 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally181;
@@ -10520,7 +10613,7 @@ 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 10519 "ConfigurationInterfaces.c"
+#line 10612 "ConfigurationInterfaces.c"
 	}
 	__finally181:
 #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10531,7 +10624,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 10530 "ConfigurationInterfaces.c"
+#line 10623 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -10541,12 +10634,13 @@ 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 10540 "ConfigurationInterfaces.c"
+#line 10633 "ConfigurationInterfaces.c"
 }
 
 
 static gint configuration_facade_real_get_printing_size_selection (ConfigurationFacade* self) {
 	gint result = 0;
+	gint _tmp9_ = 0;
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
@@ -10555,7 +10649,7 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
 		gint val = 0;
-		gint _tmp5_ = 0;
+		gint _tmp6_ = 0;
 #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"
@@ -10570,9 +10664,11 @@ 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"
+			gint _tmp5_ = 0;
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10571 "ConfigurationInterfaces.c"
+#line 10667 "ConfigurationInterfaces.c"
 				goto __catch182_configuration_error;
 			}
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10580,56 +10676,56 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return 0;
-#line 10580 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 10676 "ConfigurationInterfaces.c"
 		}
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		val = _tmp0_ - 1;
 #line 1519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = val;
+		_tmp6_ = val;
 #line 1519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		if (_tmp5_ == -2) {
-#line 10588 "ConfigurationInterfaces.c"
-			ResourcesUnitSystem _tmp6_ = 0;
+		if (_tmp6_ == -2) {
+#line 10684 "ConfigurationInterfaces.c"
+			ResourcesUnitSystem _tmp7_ = 0;
 #line 1520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp6_ = resources_get_default_measurement_unit ();
+			_tmp7_ = resources_get_default_measurement_unit ();
 #line 1520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			if (_tmp6_ == RESOURCES_UNIT_SYSTEM_IMPERIAL) {
+			if (_tmp7_ == RESOURCES_UNIT_SYSTEM_IMPERIAL) {
 #line 1521 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 				val = 2;
-#line 10596 "ConfigurationInterfaces.c"
+#line 10692 "ConfigurationInterfaces.c"
 			} else {
 #line 1523 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 				val = 10;
-#line 10600 "ConfigurationInterfaces.c"
+#line 10696 "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 10607 "ConfigurationInterfaces.c"
+#line 10703 "ConfigurationInterfaces.c"
 	}
 	goto __finally182;
 	__catch182_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp7_ = NULL;
+		GError* _tmp8_ = NULL;
 #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp7_ = err;
+		_tmp8_ = err;
 #line 1529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp7_);
+		configuration_facade_on_configuration_error (self, _tmp8_);
 #line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
 #line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10628 "ConfigurationInterfaces.c"
+#line 10724 "ConfigurationInterfaces.c"
 	}
 	__finally182:
 #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10637,8 +10733,8 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration
 #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 0;
-#line 10637 "ConfigurationInterfaces.c"
+	return _tmp9_;
+#line 10733 "ConfigurationInterfaces.c"
 }
 
 
@@ -10647,7 +10743,7 @@ 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 10646 "ConfigurationInterfaces.c"
+#line 10742 "ConfigurationInterfaces.c"
 }
 
 
@@ -10671,7 +10767,7 @@ 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 10670 "ConfigurationInterfaces.c"
+#line 10766 "ConfigurationInterfaces.c"
 				goto __catch183_configuration_error;
 			}
 #line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10680,7 +10776,7 @@ 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 10679 "ConfigurationInterfaces.c"
+#line 10775 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally183;
@@ -10698,7 +10794,7 @@ 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 10697 "ConfigurationInterfaces.c"
+#line 10793 "ConfigurationInterfaces.c"
 	}
 	__finally183:
 #line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10709,7 +10805,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 10708 "ConfigurationInterfaces.c"
+#line 10804 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -10719,7 +10815,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 10718 "ConfigurationInterfaces.c"
+#line 10814 "ConfigurationInterfaces.c"
 }
 
 
@@ -10749,7 +10845,7 @@ 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 10748 "ConfigurationInterfaces.c"
+#line 10844 "ConfigurationInterfaces.c"
 				goto __catch184_configuration_error;
 			}
 #line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10758,7 +10854,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 10757 "ConfigurationInterfaces.c"
+#line 10853 "ConfigurationInterfaces.c"
 		}
 #line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -10770,7 +10866,7 @@ 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 10769 "ConfigurationInterfaces.c"
+#line 10865 "ConfigurationInterfaces.c"
 	}
 	goto __finally184;
 	__catch184_configuration_error:
@@ -10794,7 +10890,7 @@ 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 10793 "ConfigurationInterfaces.c"
+#line 10889 "ConfigurationInterfaces.c"
 	}
 	__finally184:
 #line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10803,7 +10899,7 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF
 	g_clear_error (&_inner_error_);
 #line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 10802 "ConfigurationInterfaces.c"
+#line 10898 "ConfigurationInterfaces.c"
 }
 
 
@@ -10812,7 +10908,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 10811 "ConfigurationInterfaces.c"
+#line 10907 "ConfigurationInterfaces.c"
 }
 
 
@@ -10820,7 +10916,7 @@ 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 10819 "ConfigurationInterfaces.c"
+#line 10915 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -10839,7 +10935,7 @@ 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 10838 "ConfigurationInterfaces.c"
+#line 10934 "ConfigurationInterfaces.c"
 				goto __catch185_configuration_error;
 			}
 #line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10848,7 +10944,7 @@ 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 10847 "ConfigurationInterfaces.c"
+#line 10943 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally185;
@@ -10866,7 +10962,7 @@ 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 10865 "ConfigurationInterfaces.c"
+#line 10961 "ConfigurationInterfaces.c"
 	}
 	__finally185:
 #line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10877,7 +10973,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 10876 "ConfigurationInterfaces.c"
+#line 10972 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -10887,12 +10983,13 @@ 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 10886 "ConfigurationInterfaces.c"
+#line 10982 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_show_welcome_dialog (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -10914,9 +11011,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10915 "ConfigurationInterfaces.c"
+#line 11014 "ConfigurationInterfaces.c"
 				goto __catch186_configuration_error;
 			}
 #line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10924,35 +11023,35 @@ static gboolean configuration_facade_real_get_show_welcome_dialog (Configuration
 #line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 10924 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 11023 "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 10930 "ConfigurationInterfaces.c"
+#line 11029 "ConfigurationInterfaces.c"
 	}
 	goto __finally186;
 	__catch186_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1574 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1574 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
 #line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10951 "ConfigurationInterfaces.c"
+#line 11050 "ConfigurationInterfaces.c"
 	}
 	__finally186:
 #line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10960,8 +11059,8 @@ static gboolean configuration_facade_real_get_show_welcome_dialog (Configuration
 #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 FALSE;
-#line 10960 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 11059 "ConfigurationInterfaces.c"
 }
 
 
@@ -10970,7 +11069,7 @@ 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 10969 "ConfigurationInterfaces.c"
+#line 11068 "ConfigurationInterfaces.c"
 }
 
 
@@ -10994,7 +11093,7 @@ 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 10993 "ConfigurationInterfaces.c"
+#line 11092 "ConfigurationInterfaces.c"
 				goto __catch187_configuration_error;
 			}
 #line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11003,7 +11102,7 @@ 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 11002 "ConfigurationInterfaces.c"
+#line 11101 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally187;
@@ -11021,7 +11120,7 @@ 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 11020 "ConfigurationInterfaces.c"
+#line 11119 "ConfigurationInterfaces.c"
 	}
 	__finally187:
 #line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11032,7 +11131,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 11031 "ConfigurationInterfaces.c"
+#line 11130 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -11042,12 +11141,13 @@ 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 11041 "ConfigurationInterfaces.c"
+#line 11140 "ConfigurationInterfaces.c"
 }
 
 
 static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade* self) {
 	gint result = 0;
+	gint _tmp7_ = 0;
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
@@ -11069,9 +11169,11 @@ 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"
+			gint _tmp5_ = 0;
 #line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11070 "ConfigurationInterfaces.c"
+#line 11172 "ConfigurationInterfaces.c"
 				goto __catch188_configuration_error;
 			}
 #line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11079,35 +11181,35 @@ static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade*
 #line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return 0;
-#line 11079 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 11181 "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 11085 "ConfigurationInterfaces.c"
+#line 11187 "ConfigurationInterfaces.c"
 	}
 	goto __finally188;
 	__catch188_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 180;
 #line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11106 "ConfigurationInterfaces.c"
+#line 11208 "ConfigurationInterfaces.c"
 	}
 	__finally188:
 #line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11115,8 +11217,8 @@ static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade*
 #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 0;
-#line 11115 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 11217 "ConfigurationInterfaces.c"
 }
 
 
@@ -11125,7 +11227,7 @@ 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 11124 "ConfigurationInterfaces.c"
+#line 11226 "ConfigurationInterfaces.c"
 }
 
 
@@ -11149,7 +11251,7 @@ 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 11148 "ConfigurationInterfaces.c"
+#line 11250 "ConfigurationInterfaces.c"
 				goto __catch189_configuration_error;
 			}
 #line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11158,7 +11260,7 @@ 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 11157 "ConfigurationInterfaces.c"
+#line 11259 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally189;
@@ -11176,7 +11278,7 @@ 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 11175 "ConfigurationInterfaces.c"
+#line 11277 "ConfigurationInterfaces.c"
 	}
 	__finally189:
 #line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11187,7 +11289,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 11186 "ConfigurationInterfaces.c"
+#line 11288 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -11197,12 +11299,13 @@ 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 11196 "ConfigurationInterfaces.c"
+#line 11298 "ConfigurationInterfaces.c"
 }
 
 
 static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacade* self) {
 	gdouble result = 0.0;
+	gdouble _tmp7_ = 0.0;
 	GError * _inner_error_ = NULL;
 	{
 		gdouble _tmp0_ = 0.0;
@@ -11224,9 +11327,11 @@ 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"
+			gdouble _tmp5_ = 0.0;
 #line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11225 "ConfigurationInterfaces.c"
+#line 11330 "ConfigurationInterfaces.c"
 				goto __catch190_configuration_error;
 			}
 #line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11234,35 +11339,35 @@ static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacad
 #line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return 0.0;
-#line 11234 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 11339 "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 11240 "ConfigurationInterfaces.c"
+#line 11345 "ConfigurationInterfaces.c"
 	}
 	goto __finally190;
 	__catch190_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1619 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 3.0;
 #line 1619 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1619 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11261 "ConfigurationInterfaces.c"
+#line 11366 "ConfigurationInterfaces.c"
 	}
 	__finally190:
 #line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11270,8 +11375,8 @@ static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacad
 #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 0.0;
-#line 11270 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 11375 "ConfigurationInterfaces.c"
 }
 
 
@@ -11280,7 +11385,7 @@ 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 11279 "ConfigurationInterfaces.c"
+#line 11384 "ConfigurationInterfaces.c"
 }
 
 
@@ -11304,7 +11409,7 @@ 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 11303 "ConfigurationInterfaces.c"
+#line 11408 "ConfigurationInterfaces.c"
 				goto __catch191_configuration_error;
 			}
 #line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11313,7 +11418,7 @@ 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 11312 "ConfigurationInterfaces.c"
+#line 11417 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally191;
@@ -11331,7 +11436,7 @@ 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 11330 "ConfigurationInterfaces.c"
+#line 11435 "ConfigurationInterfaces.c"
 	}
 	__finally191:
 #line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11342,7 +11447,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 11341 "ConfigurationInterfaces.c"
+#line 11446 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -11352,12 +11457,13 @@ 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 11351 "ConfigurationInterfaces.c"
+#line 11456 "ConfigurationInterfaces.c"
 }
 
 
 static gdouble configuration_facade_real_get_slideshow_transition_delay (ConfigurationFacade* self) {
 	gdouble result = 0.0;
+	gdouble _tmp7_ = 0.0;
 	GError * _inner_error_ = NULL;
 	{
 		gdouble _tmp0_ = 0.0;
@@ -11379,9 +11485,11 @@ 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"
+			gdouble _tmp5_ = 0.0;
 #line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11380 "ConfigurationInterfaces.c"
+#line 11488 "ConfigurationInterfaces.c"
 				goto __catch192_configuration_error;
 			}
 #line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11389,35 +11497,35 @@ static gdouble configuration_facade_real_get_slideshow_transition_delay (Configu
 #line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return 0.0;
-#line 11389 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 11497 "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 11395 "ConfigurationInterfaces.c"
+#line 11503 "ConfigurationInterfaces.c"
 	}
 	goto __finally192;
 	__catch192_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1639 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1639 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0.3;
 #line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11416 "ConfigurationInterfaces.c"
+#line 11524 "ConfigurationInterfaces.c"
 	}
 	__finally192:
 #line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11425,8 +11533,8 @@ static gdouble configuration_facade_real_get_slideshow_transition_delay (Configu
 #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 0.0;
-#line 11425 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 11533 "ConfigurationInterfaces.c"
 }
 
 
@@ -11435,7 +11543,7 @@ 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 11434 "ConfigurationInterfaces.c"
+#line 11542 "ConfigurationInterfaces.c"
 }
 
 
@@ -11459,7 +11567,7 @@ 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 11458 "ConfigurationInterfaces.c"
+#line 11566 "ConfigurationInterfaces.c"
 				goto __catch193_configuration_error;
 			}
 #line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11468,7 +11576,7 @@ 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 11467 "ConfigurationInterfaces.c"
+#line 11575 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally193;
@@ -11486,7 +11594,7 @@ 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 11485 "ConfigurationInterfaces.c"
+#line 11593 "ConfigurationInterfaces.c"
 	}
 	__finally193:
 #line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11497,7 +11605,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 11496 "ConfigurationInterfaces.c"
+#line 11604 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -11507,7 +11615,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 11506 "ConfigurationInterfaces.c"
+#line 11614 "ConfigurationInterfaces.c"
 }
 
 
@@ -11537,7 +11645,7 @@ 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 11536 "ConfigurationInterfaces.c"
+#line 11644 "ConfigurationInterfaces.c"
 				goto __catch194_configuration_error;
 			}
 #line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11546,7 +11654,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 11545 "ConfigurationInterfaces.c"
+#line 11653 "ConfigurationInterfaces.c"
 		}
 #line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -11558,7 +11666,7 @@ 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 11557 "ConfigurationInterfaces.c"
+#line 11665 "ConfigurationInterfaces.c"
 	}
 	goto __finally194;
 	__catch194_configuration_error:
@@ -11582,7 +11690,7 @@ 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 11581 "ConfigurationInterfaces.c"
+#line 11689 "ConfigurationInterfaces.c"
 	}
 	__finally194:
 #line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11591,7 +11699,7 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf
 	g_clear_error (&_inner_error_);
 #line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 11590 "ConfigurationInterfaces.c"
+#line 11698 "ConfigurationInterfaces.c"
 }
 
 
@@ -11600,7 +11708,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 11599 "ConfigurationInterfaces.c"
+#line 11707 "ConfigurationInterfaces.c"
 }
 
 
@@ -11608,7 +11716,7 @@ 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 11607 "ConfigurationInterfaces.c"
+#line 11715 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -11627,7 +11735,7 @@ 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 11626 "ConfigurationInterfaces.c"
+#line 11734 "ConfigurationInterfaces.c"
 				goto __catch195_configuration_error;
 			}
 #line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11636,7 +11744,7 @@ 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 11635 "ConfigurationInterfaces.c"
+#line 11743 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally195;
@@ -11654,7 +11762,7 @@ 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 11653 "ConfigurationInterfaces.c"
+#line 11761 "ConfigurationInterfaces.c"
 	}
 	__finally195:
 #line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11665,7 +11773,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 11664 "ConfigurationInterfaces.c"
+#line 11772 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -11675,12 +11783,13 @@ 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 11674 "ConfigurationInterfaces.c"
+#line 11782 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_slideshow_show_title (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -11702,9 +11811,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11703 "ConfigurationInterfaces.c"
+#line 11814 "ConfigurationInterfaces.c"
 				goto __catch196_configuration_error;
 			}
 #line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11712,35 +11823,35 @@ static gboolean configuration_facade_real_get_slideshow_show_title (Configuratio
 #line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 11712 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 11823 "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 11718 "ConfigurationInterfaces.c"
+#line 11829 "ConfigurationInterfaces.c"
 	}
 	goto __finally196;
 	__catch196_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
 #line 1688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11739 "ConfigurationInterfaces.c"
+#line 11850 "ConfigurationInterfaces.c"
 	}
 	__finally196:
 #line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11748,8 +11859,8 @@ static gboolean configuration_facade_real_get_slideshow_show_title (Configuratio
 #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 FALSE;
-#line 11748 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 11859 "ConfigurationInterfaces.c"
 }
 
 
@@ -11758,7 +11869,7 @@ 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 11757 "ConfigurationInterfaces.c"
+#line 11868 "ConfigurationInterfaces.c"
 }
 
 
@@ -11782,7 +11893,7 @@ 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 11781 "ConfigurationInterfaces.c"
+#line 11892 "ConfigurationInterfaces.c"
 				goto __catch197_configuration_error;
 			}
 #line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11791,7 +11902,7 @@ 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 11790 "ConfigurationInterfaces.c"
+#line 11901 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally197;
@@ -11809,7 +11920,7 @@ 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 11808 "ConfigurationInterfaces.c"
+#line 11919 "ConfigurationInterfaces.c"
 	}
 	__finally197:
 #line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11820,7 +11931,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 11819 "ConfigurationInterfaces.c"
+#line 11930 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -11830,7 +11941,7 @@ 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 11829 "ConfigurationInterfaces.c"
+#line 11940 "ConfigurationInterfaces.c"
 }
 
 
@@ -11845,7 +11956,7 @@ static void g_time_local (time_t time, struct tm* result) {
 	*result = _result_;
 #line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return;
-#line 11844 "ConfigurationInterfaces.c"
+#line 11955 "ConfigurationInterfaces.c"
 }
 
 
@@ -11891,12 +12002,13 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	buffer = (g_free (buffer), NULL);
 #line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 11890 "ConfigurationInterfaces.c"
+#line 12001 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp12_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -11918,9 +12030,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11919 "ConfigurationInterfaces.c"
+#line 12033 "ConfigurationInterfaces.c"
 				goto __catch198_configuration_error;
 			}
 #line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11928,52 +12042,52 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac
 #line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 11928 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 12042 "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 11934 "ConfigurationInterfaces.c"
+#line 12048 "ConfigurationInterfaces.c"
 	}
 	goto __finally198;
 	__catch198_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
-		struct tm _tmp6_ = {0};
-		gchar* _tmp7_ = NULL;
+		GError* _tmp6_ = NULL;
+		struct tm _tmp7_ = {0};
 		gchar* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
+		gchar* _tmp9_ = NULL;
 		gboolean _tmp10_ = FALSE;
+		gboolean _tmp11_ = FALSE;
 #line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		g_time_local ((time_t) 0, &_tmp6_);
+		g_time_local ((time_t) 0, &_tmp7_);
 #line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp7_ = g_time_format (&_tmp6_, "%p");
+		_tmp8_ = g_time_format (&_tmp7_, "%p");
 #line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp8_ = _tmp7_;
+		_tmp9_ = _tmp8_;
 #line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp9_ = is_string_empty (_tmp8_);
+		_tmp10_ = is_string_empty (_tmp9_);
 #line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp10_ = _tmp9_;
+		_tmp11_ = _tmp10_;
 #line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_g_free0 (_tmp8_);
+		_g_free0 (_tmp9_);
 #line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		result = _tmp10_;
+		result = _tmp11_;
 #line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11972 "ConfigurationInterfaces.c"
+#line 12086 "ConfigurationInterfaces.c"
 	}
 	__finally198:
 #line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11981,8 +12095,8 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac
 #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 FALSE;
-#line 11981 "ConfigurationInterfaces.c"
+	return _tmp12_;
+#line 12095 "ConfigurationInterfaces.c"
 }
 
 
@@ -11991,7 +12105,7 @@ 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 11990 "ConfigurationInterfaces.c"
+#line 12104 "ConfigurationInterfaces.c"
 }
 
 
@@ -12015,7 +12129,7 @@ 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 12014 "ConfigurationInterfaces.c"
+#line 12128 "ConfigurationInterfaces.c"
 				goto __catch199_configuration_error;
 			}
 #line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12024,7 +12138,7 @@ 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 12023 "ConfigurationInterfaces.c"
+#line 12137 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally199;
@@ -12042,7 +12156,7 @@ 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 12041 "ConfigurationInterfaces.c"
+#line 12155 "ConfigurationInterfaces.c"
 	}
 	__finally199:
 #line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12053,7 +12167,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 12052 "ConfigurationInterfaces.c"
+#line 12166 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -12063,12 +12177,13 @@ 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 12062 "ConfigurationInterfaces.c"
+#line 12176 "ConfigurationInterfaces.c"
 }
 
 
 static gboolean configuration_facade_real_get_use_lowercase_filenames (ConfigurationFacade* self) {
 	gboolean result = FALSE;
+	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
 	{
 		gboolean _tmp0_ = FALSE;
@@ -12090,9 +12205,11 @@ 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"
+			gboolean _tmp5_ = FALSE;
 #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12091 "ConfigurationInterfaces.c"
+#line 12208 "ConfigurationInterfaces.c"
 				goto __catch200_configuration_error;
 			}
 #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12100,35 +12217,35 @@ static gboolean configuration_facade_real_get_use_lowercase_filenames (Configura
 #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return FALSE;
-#line 12100 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 12217 "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 12106 "ConfigurationInterfaces.c"
+#line 12223 "ConfigurationInterfaces.c"
 	}
 	goto __finally200;
 	__catch200_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1730 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1730 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
 #line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12127 "ConfigurationInterfaces.c"
+#line 12244 "ConfigurationInterfaces.c"
 	}
 	__finally200:
 #line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12136,8 +12253,8 @@ static gboolean configuration_facade_real_get_use_lowercase_filenames (Configura
 #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 FALSE;
-#line 12136 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 12253 "ConfigurationInterfaces.c"
 }
 
 
@@ -12146,7 +12263,7 @@ 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 12145 "ConfigurationInterfaces.c"
+#line 12262 "ConfigurationInterfaces.c"
 }
 
 
@@ -12170,7 +12287,7 @@ 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 12169 "ConfigurationInterfaces.c"
+#line 12286 "ConfigurationInterfaces.c"
 				goto __catch201_configuration_error;
 			}
 #line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12179,7 +12296,7 @@ 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 12178 "ConfigurationInterfaces.c"
+#line 12295 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally201;
@@ -12197,7 +12314,7 @@ 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 12196 "ConfigurationInterfaces.c"
+#line 12313 "ConfigurationInterfaces.c"
 	}
 	__finally201:
 #line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12208,7 +12325,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 12207 "ConfigurationInterfaces.c"
+#line 12324 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -12218,12 +12335,13 @@ 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 12217 "ConfigurationInterfaces.c"
+#line 12334 "ConfigurationInterfaces.c"
 }
 
 
 static gint configuration_facade_real_get_video_interpreter_state_cookie (ConfigurationFacade* self) {
 	gint result = 0;
+	gint _tmp7_ = 0;
 	GError * _inner_error_ = NULL;
 	{
 		gint _tmp0_ = 0;
@@ -12245,9 +12363,11 @@ 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"
+			gint _tmp5_ = 0;
 #line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12246 "ConfigurationInterfaces.c"
+#line 12366 "ConfigurationInterfaces.c"
 				goto __catch202_configuration_error;
 			}
 #line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12255,35 +12375,35 @@ static gint configuration_facade_real_get_video_interpreter_state_cookie (Config
 #line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
 #line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return 0;
-#line 12255 "ConfigurationInterfaces.c"
+			return _tmp5_;
+#line 12375 "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 12261 "ConfigurationInterfaces.c"
+#line 12381 "ConfigurationInterfaces.c"
 	}
 	goto __finally202;
 	__catch202_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
 #line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
 #line 1752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
+		_tmp6_ = err;
 #line 1752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
+		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = -1;
 #line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
 #line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12282 "ConfigurationInterfaces.c"
+#line 12402 "ConfigurationInterfaces.c"
 	}
 	__finally202:
 #line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12291,8 +12411,8 @@ static gint configuration_facade_real_get_video_interpreter_state_cookie (Config
 #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 0;
-#line 12291 "ConfigurationInterfaces.c"
+	return _tmp7_;
+#line 12411 "ConfigurationInterfaces.c"
 }
 
 
@@ -12301,7 +12421,7 @@ 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 12300 "ConfigurationInterfaces.c"
+#line 12420 "ConfigurationInterfaces.c"
 }
 
 
@@ -12325,7 +12445,7 @@ 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 12324 "ConfigurationInterfaces.c"
+#line 12444 "ConfigurationInterfaces.c"
 				goto __catch203_configuration_error;
 			}
 #line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12334,7 +12454,7 @@ 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 12333 "ConfigurationInterfaces.c"
+#line 12453 "ConfigurationInterfaces.c"
 		}
 	}
 	goto __finally203;
@@ -12352,7 +12472,7 @@ 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 12351 "ConfigurationInterfaces.c"
+#line 12471 "ConfigurationInterfaces.c"
 	}
 	__finally203:
 #line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12363,7 +12483,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 12362 "ConfigurationInterfaces.c"
+#line 12482 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -12373,7 +12493,7 @@ 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 12372 "ConfigurationInterfaces.c"
+#line 12492 "ConfigurationInterfaces.c"
 }
 
 
@@ -12415,7 +12535,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 12414 "ConfigurationInterfaces.c"
+#line 12534 "ConfigurationInterfaces.c"
 }
 
 
@@ -12424,7 +12544,7 @@ 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 12423 "ConfigurationInterfaces.c"
+#line 12543 "ConfigurationInterfaces.c"
 }
 
 
@@ -12457,7 +12577,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 12456 "ConfigurationInterfaces.c"
+#line 12576 "ConfigurationInterfaces.c"
 }
 
 
@@ -12466,7 +12586,7 @@ 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 12465 "ConfigurationInterfaces.c"
+#line 12585 "ConfigurationInterfaces.c"
 }
 
 
@@ -12508,7 +12628,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 12507 "ConfigurationInterfaces.c"
+#line 12627 "ConfigurationInterfaces.c"
 }
 
 
@@ -12517,7 +12637,7 @@ 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 12516 "ConfigurationInterfaces.c"
+#line 12636 "ConfigurationInterfaces.c"
 }
 
 
@@ -12550,7 +12670,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 12549 "ConfigurationInterfaces.c"
+#line 12669 "ConfigurationInterfaces.c"
 }
 
 
@@ -12559,7 +12679,7 @@ 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 12558 "ConfigurationInterfaces.c"
+#line 12678 "ConfigurationInterfaces.c"
 }
 
 
@@ -12601,7 +12721,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 12600 "ConfigurationInterfaces.c"
+#line 12720 "ConfigurationInterfaces.c"
 }
 
 
@@ -12610,7 +12730,7 @@ 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 12609 "ConfigurationInterfaces.c"
+#line 12729 "ConfigurationInterfaces.c"
 }
 
 
@@ -12643,7 +12763,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 12642 "ConfigurationInterfaces.c"
+#line 12762 "ConfigurationInterfaces.c"
 }
 
 
@@ -12652,7 +12772,7 @@ 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 12651 "ConfigurationInterfaces.c"
+#line 12771 "ConfigurationInterfaces.c"
 }
 
 
@@ -12702,14 +12822,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 12701 "ConfigurationInterfaces.c"
+#line 12821 "ConfigurationInterfaces.c"
 	} else {
 		const gchar* _tmp10_ = NULL;
 #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 12708 "ConfigurationInterfaces.c"
+#line 12828 "ConfigurationInterfaces.c"
 	}
 #line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp11_ = g_strdup (_tmp8_);
@@ -12719,7 +12839,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 12718 "ConfigurationInterfaces.c"
+#line 12838 "ConfigurationInterfaces.c"
 }
 
 
@@ -12728,7 +12848,7 @@ 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 12727 "ConfigurationInterfaces.c"
+#line 12847 "ConfigurationInterfaces.c"
 }
 
 
@@ -12752,7 +12872,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 12751 "ConfigurationInterfaces.c"
+#line 12871 "ConfigurationInterfaces.c"
 	}
 #line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = configuration_facade_get_engine (self);
@@ -12770,7 +12890,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 12769 "ConfigurationInterfaces.c"
+#line 12889 "ConfigurationInterfaces.c"
 }
 
 
@@ -12779,7 +12899,7 @@ 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 12778 "ConfigurationInterfaces.c"
+#line 12898 "ConfigurationInterfaces.c"
 }
 
 
@@ -12809,7 +12929,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 12808 "ConfigurationInterfaces.c"
+#line 12928 "ConfigurationInterfaces.c"
 }
 
 
@@ -12818,7 +12938,7 @@ 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 12817 "ConfigurationInterfaces.c"
+#line 12937 "ConfigurationInterfaces.c"
 }
 
 
@@ -12847,7 +12967,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 12846 "ConfigurationInterfaces.c"
+#line 12966 "ConfigurationInterfaces.c"
 }
 
 
@@ -12856,7 +12976,7 @@ 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 12855 "ConfigurationInterfaces.c"
+#line 12975 "ConfigurationInterfaces.c"
 }
 
 
@@ -12879,7 +12999,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 12878 "ConfigurationInterfaces.c"
+#line 12998 "ConfigurationInterfaces.c"
 }
 
 
@@ -12888,7 +13008,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 12887 "ConfigurationInterfaces.c"
+#line 13007 "ConfigurationInterfaces.c"
 }
 
 
@@ -12898,271 +13018,271 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -13177,14 +13297,14 @@ static void configuration_facade_class_init (ConfigurationFacadeClass * klass) {
 	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 13176 "ConfigurationInterfaces.c"
+#line 13296 "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 13183 "ConfigurationInterfaces.c"
+#line 13303 "ConfigurationInterfaces.c"
 }
 
 
@@ -13196,7 +13316,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 13195 "ConfigurationInterfaces.c"
+#line 13315 "ConfigurationInterfaces.c"
 }
 
 
diff --git a/src/config/GSettingsEngine.c b/src/config/GSettingsEngine.c
index 873e431..d70a944 100644
--- a/src/config/GSettingsEngine.c
+++ b/src/config/GSettingsEngine.c
@@ -1,4 +1,4 @@
-/* GSettingsEngine.c generated by valac 0.34.4, the Vala compiler
+/* GSettingsEngine.c generated by valac 0.34.7, the Vala compiler
  * generated from GSettingsEngine.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2655,11 +2655,11 @@ static gboolean gsettings_configuration_engine_get_gs_bool (GSettingsConfigurati
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	GSettings* schema_object = NULL;
-	const gchar* _tmp2_ = NULL;
-	GSettings* _tmp3_ = NULL;
-	GSettings* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	const gchar* _tmp4_ = NULL;
+	GSettings* _tmp5_ = NULL;
+	GSettings* _tmp6_ = NULL;
+	const gchar* _tmp7_ = NULL;
+	gboolean _tmp8_ = FALSE;
 	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);
@@ -2677,40 +2677,43 @@ static gboolean gsettings_configuration_engine_get_gs_bool (GSettingsConfigurati
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
+#line 2681 "GSettingsEngine.c"
+			gboolean _tmp2_ = FALSE;
 #line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
 #line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-			return FALSE;
-#line 2685 "GSettingsEngine.c"
+			return _tmp2_;
+#line 2687 "GSettingsEngine.c"
 		} else {
+			gboolean _tmp3_ = FALSE;
 #line 188 "/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);
 #line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
 #line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-			return FALSE;
-#line 2693 "GSettingsEngine.c"
+			return _tmp3_;
+#line 2696 "GSettingsEngine.c"
 		}
 	}
 #line 190 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp2_ = schema;
+	_tmp4_ = schema;
 #line 190 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp3_ = g_settings_new (_tmp2_);
+	_tmp5_ = g_settings_new (_tmp4_);
 #line 190 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	schema_object = _tmp3_;
+	schema_object = _tmp5_;
 #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp4_ = schema_object;
+	_tmp6_ = schema_object;
 #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp5_ = key;
+	_tmp7_ = key;
 #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp6_ = g_settings_get_boolean (_tmp4_, _tmp5_);
+	_tmp8_ = g_settings_get_boolean (_tmp6_, _tmp7_);
 #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	result = _tmp6_;
+	result = _tmp8_;
 #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
 #line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 2714 "GSettingsEngine.c"
+#line 2717 "GSettingsEngine.c"
 }
 
 
@@ -2744,7 +2747,7 @@ static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEn
 			g_propagate_error (error, _inner_error_);
 #line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2748 "GSettingsEngine.c"
+#line 2751 "GSettingsEngine.c"
 		} else {
 #line 196 "/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);
@@ -2752,7 +2755,7 @@ static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEn
 			g_clear_error (&_inner_error_);
 #line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2756 "GSettingsEngine.c"
+#line 2759 "GSettingsEngine.c"
 		}
 	}
 #line 198 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -2771,7 +2774,7 @@ static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEn
 	g_settings_set_boolean (_tmp4_, _tmp5_, _tmp6_);
 #line 195 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 2775 "GSettingsEngine.c"
+#line 2778 "GSettingsEngine.c"
 }
 
 
@@ -2805,7 +2808,7 @@ static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEn
 			g_propagate_error (error, _inner_error_);
 #line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2809 "GSettingsEngine.c"
+#line 2812 "GSettingsEngine.c"
 		} else {
 #line 204 "/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);
@@ -2813,7 +2816,7 @@ static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEn
 			g_clear_error (&_inner_error_);
 #line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2817 "GSettingsEngine.c"
+#line 2820 "GSettingsEngine.c"
 		}
 	}
 #line 206 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -2832,7 +2835,7 @@ static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEn
 	g_settings_set_enum (_tmp4_, _tmp5_, _tmp6_);
 #line 203 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 2836 "GSettingsEngine.c"
+#line 2839 "GSettingsEngine.c"
 }
 
 
@@ -2841,11 +2844,11 @@ static gint gsettings_configuration_engine_get_gs_enum (GSettingsConfigurationEn
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	GSettings* schema_object = NULL;
-	const gchar* _tmp2_ = NULL;
-	GSettings* _tmp3_ = NULL;
-	GSettings* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
+	const gchar* _tmp4_ = NULL;
+	GSettings* _tmp5_ = NULL;
+	GSettings* _tmp6_ = NULL;
+	const gchar* _tmp7_ = NULL;
+	gint _tmp8_ = 0;
 	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);
@@ -2863,40 +2866,43 @@ static gint gsettings_configuration_engine_get_gs_enum (GSettingsConfigurationEn
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
+#line 2870 "GSettingsEngine.c"
+			gint _tmp2_ = 0;
 #line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
 #line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-			return 0;
-#line 2871 "GSettingsEngine.c"
+			return _tmp2_;
+#line 2876 "GSettingsEngine.c"
 		} else {
+			gint _tmp3_ = 0;
 #line 211 "/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);
 #line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
 #line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-			return 0;
-#line 2879 "GSettingsEngine.c"
+			return _tmp3_;
+#line 2885 "GSettingsEngine.c"
 		}
 	}
 #line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp2_ = schema;
+	_tmp4_ = schema;
 #line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp3_ = g_settings_new (_tmp2_);
+	_tmp5_ = g_settings_new (_tmp4_);
 #line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	schema_object = _tmp3_;
+	schema_object = _tmp5_;
 #line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp4_ = schema_object;
+	_tmp6_ = schema_object;
 #line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp5_ = key;
+	_tmp7_ = key;
 #line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp6_ = g_settings_get_enum (_tmp4_, _tmp5_);
+	_tmp8_ = g_settings_get_enum (_tmp6_, _tmp7_);
 #line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	result = _tmp6_;
+	result = _tmp8_;
 #line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
 #line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 2900 "GSettingsEngine.c"
+#line 2906 "GSettingsEngine.c"
 }
 
 
@@ -2905,11 +2911,11 @@ static gint gsettings_configuration_engine_get_gs_int (GSettingsConfigurationEng
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	GSettings* schema_object = NULL;
-	const gchar* _tmp2_ = NULL;
-	GSettings* _tmp3_ = NULL;
-	GSettings* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
+	const gchar* _tmp4_ = NULL;
+	GSettings* _tmp5_ = NULL;
+	GSettings* _tmp6_ = NULL;
+	const gchar* _tmp7_ = NULL;
+	gint _tmp8_ = 0;
 	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);
@@ -2927,40 +2933,43 @@ static gint gsettings_configuration_engine_get_gs_int (GSettingsConfigurationEng
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
+#line 2937 "GSettingsEngine.c"
+			gint _tmp2_ = 0;
 #line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
 #line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-			return 0;
-#line 2935 "GSettingsEngine.c"
+			return _tmp2_;
+#line 2943 "GSettingsEngine.c"
 		} else {
+			gint _tmp3_ = 0;
 #line 218 "/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);
 #line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
 #line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-			return 0;
-#line 2943 "GSettingsEngine.c"
+			return _tmp3_;
+#line 2952 "GSettingsEngine.c"
 		}
 	}
 #line 220 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp2_ = schema;
+	_tmp4_ = schema;
 #line 220 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp3_ = g_settings_new (_tmp2_);
+	_tmp5_ = g_settings_new (_tmp4_);
 #line 220 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	schema_object = _tmp3_;
+	schema_object = _tmp5_;
 #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp4_ = schema_object;
+	_tmp6_ = schema_object;
 #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp5_ = key;
+	_tmp7_ = key;
 #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp6_ = g_settings_get_int (_tmp4_, _tmp5_);
+	_tmp8_ = g_settings_get_int (_tmp6_, _tmp7_);
 #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	result = _tmp6_;
+	result = _tmp8_;
 #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
 #line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 2964 "GSettingsEngine.c"
+#line 2973 "GSettingsEngine.c"
 }
 
 
@@ -2994,7 +3003,7 @@ static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEng
 			g_propagate_error (error, _inner_error_);
 #line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2998 "GSettingsEngine.c"
+#line 3007 "GSettingsEngine.c"
 		} else {
 #line 226 "/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);
@@ -3002,7 +3011,7 @@ static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEng
 			g_clear_error (&_inner_error_);
 #line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3006 "GSettingsEngine.c"
+#line 3015 "GSettingsEngine.c"
 		}
 	}
 #line 228 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -3021,7 +3030,7 @@ static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEng
 	g_settings_set_int (_tmp4_, _tmp5_, _tmp6_);
 #line 225 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 3025 "GSettingsEngine.c"
+#line 3034 "GSettingsEngine.c"
 }
 
 
@@ -3030,11 +3039,11 @@ static gdouble gsettings_configuration_engine_get_gs_double (GSettingsConfigurat
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	GSettings* schema_object = NULL;
-	const gchar* _tmp2_ = NULL;
-	GSettings* _tmp3_ = NULL;
-	GSettings* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gdouble _tmp6_ = 0.0;
+	const gchar* _tmp4_ = NULL;
+	GSettings* _tmp5_ = NULL;
+	GSettings* _tmp6_ = NULL;
+	const gchar* _tmp7_ = NULL;
+	gdouble _tmp8_ = 0.0;
 	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);
@@ -3052,40 +3061,43 @@ static gdouble gsettings_configuration_engine_get_gs_double (GSettingsConfigurat
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
+#line 3065 "GSettingsEngine.c"
+			gdouble _tmp2_ = 0.0;
 #line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
 #line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-			return 0.0;
-#line 3060 "GSettingsEngine.c"
+			return _tmp2_;
+#line 3071 "GSettingsEngine.c"
 		} else {
+			gdouble _tmp3_ = 0.0;
 #line 234 "/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);
 #line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
 #line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-			return 0.0;
-#line 3068 "GSettingsEngine.c"
+			return _tmp3_;
+#line 3080 "GSettingsEngine.c"
 		}
 	}
 #line 236 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp2_ = schema;
+	_tmp4_ = schema;
 #line 236 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp3_ = g_settings_new (_tmp2_);
+	_tmp5_ = g_settings_new (_tmp4_);
 #line 236 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	schema_object = _tmp3_;
+	schema_object = _tmp5_;
 #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp4_ = schema_object;
+	_tmp6_ = schema_object;
 #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp5_ = key;
+	_tmp7_ = key;
 #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp6_ = g_settings_get_double (_tmp4_, _tmp5_);
+	_tmp8_ = g_settings_get_double (_tmp6_, _tmp7_);
 #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	result = _tmp6_;
+	result = _tmp8_;
 #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
 #line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3089 "GSettingsEngine.c"
+#line 3101 "GSettingsEngine.c"
 }
 
 
@@ -3119,7 +3131,7 @@ static void gsettings_configuration_engine_set_gs_double (GSettingsConfiguration
 			g_propagate_error (error, _inner_error_);
 #line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3123 "GSettingsEngine.c"
+#line 3135 "GSettingsEngine.c"
 		} else {
 #line 242 "/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);
@@ -3127,7 +3139,7 @@ static void gsettings_configuration_engine_set_gs_double (GSettingsConfiguration
 			g_clear_error (&_inner_error_);
 #line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3131 "GSettingsEngine.c"
+#line 3143 "GSettingsEngine.c"
 		}
 	}
 #line 244 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -3146,7 +3158,7 @@ static void gsettings_configuration_engine_set_gs_double (GSettingsConfiguration
 	g_settings_set_double (_tmp4_, _tmp5_, _tmp6_);
 #line 241 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 3150 "GSettingsEngine.c"
+#line 3162 "GSettingsEngine.c"
 }
 
 
@@ -3181,7 +3193,7 @@ static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurati
 			g_propagate_error (error, _inner_error_);
 #line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return NULL;
-#line 3185 "GSettingsEngine.c"
+#line 3197 "GSettingsEngine.c"
 		} else {
 #line 250 "/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);
@@ -3189,7 +3201,7 @@ static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurati
 			g_clear_error (&_inner_error_);
 #line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return NULL;
-#line 3193 "GSettingsEngine.c"
+#line 3205 "GSettingsEngine.c"
 		}
 	}
 #line 252 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -3210,7 +3222,7 @@ static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurati
 	_g_object_unref0 (schema_object);
 #line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3214 "GSettingsEngine.c"
+#line 3226 "GSettingsEngine.c"
 }
 
 
@@ -3246,7 +3258,7 @@ static void gsettings_configuration_engine_set_gs_string (GSettingsConfiguration
 			g_propagate_error (error, _inner_error_);
 #line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3250 "GSettingsEngine.c"
+#line 3262 "GSettingsEngine.c"
 		} else {
 #line 258 "/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);
@@ -3254,7 +3266,7 @@ static void gsettings_configuration_engine_set_gs_string (GSettingsConfiguration
 			g_clear_error (&_inner_error_);
 #line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3258 "GSettingsEngine.c"
+#line 3270 "GSettingsEngine.c"
 		}
 	}
 #line 260 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -3273,7 +3285,7 @@ static void gsettings_configuration_engine_set_gs_string (GSettingsConfiguration
 	g_settings_set_string (_tmp4_, _tmp5_, _tmp6_);
 #line 257 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 3277 "GSettingsEngine.c"
+#line 3289 "GSettingsEngine.c"
 }
 
 
@@ -3306,7 +3318,7 @@ static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigu
 			g_propagate_error (error, _inner_error_);
 #line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3310 "GSettingsEngine.c"
+#line 3322 "GSettingsEngine.c"
 		} else {
 #line 266 "/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);
@@ -3314,7 +3326,7 @@ static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigu
 			g_clear_error (&_inner_error_);
 #line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3318 "GSettingsEngine.c"
+#line 3330 "GSettingsEngine.c"
 		}
 	}
 #line 268 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -3331,7 +3343,7 @@ static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigu
 	g_settings_reset (_tmp4_, _tmp5_);
 #line 265 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 3335 "GSettingsEngine.c"
+#line 3347 "GSettingsEngine.c"
 }
 
 
@@ -3344,7 +3356,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	g_return_val_if_fail (old != NULL, NULL);
 #line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 3348 "GSettingsEngine.c"
+#line 3360 "GSettingsEngine.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -3375,7 +3387,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3379 "GSettingsEngine.c"
+#line 3391 "GSettingsEngine.c"
 				goto __catch204_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3384,7 +3396,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3388 "GSettingsEngine.c"
+#line 3400 "GSettingsEngine.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
@@ -3400,7 +3412,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3404 "GSettingsEngine.c"
+#line 3416 "GSettingsEngine.c"
 				goto __catch204_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3411,7 +3423,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3415 "GSettingsEngine.c"
+#line 3427 "GSettingsEngine.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
@@ -3425,7 +3437,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 3429 "GSettingsEngine.c"
+#line 3441 "GSettingsEngine.c"
 	}
 	goto __finally204;
 	__catch204_g_regex_error:
@@ -3439,7 +3451,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 3443 "GSettingsEngine.c"
+#line 3455 "GSettingsEngine.c"
 	}
 	__finally204:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3450,7 +3462,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
-#line 3454 "GSettingsEngine.c"
+#line 3466 "GSettingsEngine.c"
 	}
 }
 
@@ -3474,7 +3486,7 @@ static gchar* string_strip (const gchar* self) {
 	result = _result_;
 #line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 3478 "GSettingsEngine.c"
+#line 3490 "GSettingsEngine.c"
 }
 
 
@@ -3511,17 +3523,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 3515 "GSettingsEngine.c"
+#line 3527 "GSettingsEngine.c"
 		const gchar* _tmp7_ = NULL;
 #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 3521 "GSettingsEngine.c"
+#line 3533 "GSettingsEngine.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = NULL;
-#line 3525 "GSettingsEngine.c"
+#line 3537 "GSettingsEngine.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp8_ = g_strdup (_tmp4_);
@@ -3531,7 +3543,7 @@ 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 3535 "GSettingsEngine.c"
+#line 3547 "GSettingsEngine.c"
 }
 
 
@@ -3557,7 +3569,7 @@ 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 3561 "GSettingsEngine.c"
+#line 3573 "GSettingsEngine.c"
 		gchar* _tmp3_ = NULL;
 #line 283 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = g_strdup ("default");
@@ -3565,7 +3577,7 @@ static gchar* gsettings_configuration_engine_get_plugin_enable_disable_name (con
 		_g_free0 (cleaned_id);
 #line 283 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		cleaned_id = _tmp3_;
-#line 3569 "GSettingsEngine.c"
+#line 3581 "GSettingsEngine.c"
 	}
 #line 285 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = cleaned_id;
@@ -3587,7 +3599,7 @@ 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 3591 "GSettingsEngine.c"
+#line 3603 "GSettingsEngine.c"
 }
 
 
@@ -3616,7 +3628,7 @@ 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 3620 "GSettingsEngine.c"
+#line 3632 "GSettingsEngine.c"
 		gchar* _tmp3_ = NULL;
 #line 294 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = g_strdup ("default");
@@ -3624,7 +3636,7 @@ static gchar* gsettings_configuration_engine_make_plugin_schema_name (const gcha
 		_g_free0 (cleaned_id);
 #line 294 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		cleaned_id = _tmp3_;
-#line 3628 "GSettingsEngine.c"
+#line 3640 "GSettingsEngine.c"
 	}
 #line 295 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = cleaned_id;
@@ -3646,7 +3658,7 @@ 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 3650 "GSettingsEngine.c"
+#line 3662 "GSettingsEngine.c"
 }
 
 
@@ -3664,7 +3676,7 @@ 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 3668 "GSettingsEngine.c"
+#line 3680 "GSettingsEngine.c"
 }
 
 
@@ -3680,7 +3692,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 3684 "GSettingsEngine.c"
+#line 3696 "GSettingsEngine.c"
 }
 
 
@@ -3724,26 +3736,29 @@ 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"
+			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 0;
-#line 3732 "GSettingsEngine.c"
+			return _tmp8_;
+#line 3746 "GSettingsEngine.c"
 		} else {
+			gint _tmp9_ = 0;
 #line 309 "/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);
 #line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
 #line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-			return 0;
-#line 3740 "GSettingsEngine.c"
+			return _tmp9_;
+#line 3755 "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 3747 "GSettingsEngine.c"
+#line 3762 "GSettingsEngine.c"
 }
 
 
@@ -3790,7 +3805,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 3794 "GSettingsEngine.c"
+#line 3809 "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);
@@ -3798,14 +3813,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 3802 "GSettingsEngine.c"
+#line 3817 "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 3809 "GSettingsEngine.c"
+#line 3824 "GSettingsEngine.c"
 }
 
 
@@ -3849,26 +3864,29 @@ 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"
+			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 0;
-#line 3857 "GSettingsEngine.c"
+			return _tmp8_;
+#line 3874 "GSettingsEngine.c"
 		} else {
+			gint _tmp9_ = 0;
 #line 318 "/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);
 #line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
 #line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-			return 0;
-#line 3865 "GSettingsEngine.c"
+			return _tmp9_;
+#line 3883 "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 3872 "GSettingsEngine.c"
+#line 3890 "GSettingsEngine.c"
 }
 
 
@@ -3915,7 +3933,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 3919 "GSettingsEngine.c"
+#line 3937 "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);
@@ -3923,14 +3941,14 @@ 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 3927 "GSettingsEngine.c"
+#line 3945 "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 3934 "GSettingsEngine.c"
+#line 3952 "GSettingsEngine.c"
 }
 
 
@@ -3953,7 +3971,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 3957 "GSettingsEngine.c"
+#line 3975 "GSettingsEngine.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -3961,7 +3979,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 3965 "GSettingsEngine.c"
+#line 3983 "GSettingsEngine.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -3973,7 +3991,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 3977 "GSettingsEngine.c"
+#line 3995 "GSettingsEngine.c"
 	}
 }
 
@@ -3997,21 +4015,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 4001 "GSettingsEngine.c"
+#line 4019 "GSettingsEngine.c"
 		glong _tmp2_ = 0L;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 4007 "GSettingsEngine.c"
+#line 4025 "GSettingsEngine.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 4011 "GSettingsEngine.c"
+#line 4029 "GSettingsEngine.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 4015 "GSettingsEngine.c"
+#line 4033 "GSettingsEngine.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -4023,7 +4041,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 4027 "GSettingsEngine.c"
+#line 4045 "GSettingsEngine.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -4033,13 +4051,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 4037 "GSettingsEngine.c"
+#line 4055 "GSettingsEngine.c"
 	}
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 4043 "GSettingsEngine.c"
+#line 4061 "GSettingsEngine.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -4053,7 +4071,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 4057 "GSettingsEngine.c"
+#line 4075 "GSettingsEngine.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -4063,13 +4081,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 4067 "GSettingsEngine.c"
+#line 4085 "GSettingsEngine.c"
 	}
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 4073 "GSettingsEngine.c"
+#line 4091 "GSettingsEngine.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4078,7 +4096,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 4082 "GSettingsEngine.c"
+#line 4100 "GSettingsEngine.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -4098,7 +4116,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 4102 "GSettingsEngine.c"
+#line 4120 "GSettingsEngine.c"
 }
 
 
@@ -4149,7 +4167,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 4153 "GSettingsEngine.c"
+#line 4171 "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);
@@ -4157,7 +4175,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 4161 "GSettingsEngine.c"
+#line 4179 "GSettingsEngine.c"
 		}
 	}
 #line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4168,7 +4186,7 @@ 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 4172 "GSettingsEngine.c"
+#line 4190 "GSettingsEngine.c"
 		gchar* _tmp9_ = NULL;
 #line 333 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp9_ = string_substring (gs_result, (glong) 7, (glong) -1);
@@ -4176,7 +4194,7 @@ static gchar* gsettings_configuration_engine_real_get_string_property (Configura
 		_g_free0 (_result_);
 #line 333 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_result_ = _tmp9_;
-#line 4180 "GSettingsEngine.c"
+#line 4198 "GSettingsEngine.c"
 	}
 #line 336 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _result_;
@@ -4184,7 +4202,7 @@ 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 4188 "GSettingsEngine.c"
+#line 4206 "GSettingsEngine.c"
 }
 
 
@@ -4222,18 +4240,18 @@ 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 4226 "GSettingsEngine.c"
+#line 4244 "GSettingsEngine.c"
 	} else {
 		ConfigurableProperty _tmp4_ = 0;
 #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 4233 "GSettingsEngine.c"
+#line 4251 "GSettingsEngine.c"
 	}
 #line 342 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (_tmp2_) {
-#line 4237 "GSettingsEngine.c"
+#line 4255 "GSettingsEngine.c"
 		const gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 #line 344 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4244,7 +4262,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 4248 "GSettingsEngine.c"
+#line 4266 "GSettingsEngine.c"
 	}
 #line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = self->priv->schema_names;
@@ -4276,7 +4294,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 4280 "GSettingsEngine.c"
+#line 4298 "GSettingsEngine.c"
 		} else {
 #line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (converted_val);
@@ -4286,7 +4304,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 4290 "GSettingsEngine.c"
+#line 4308 "GSettingsEngine.c"
 		}
 	}
 #line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4295,7 +4313,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 4299 "GSettingsEngine.c"
+#line 4317 "GSettingsEngine.c"
 }
 
 
@@ -4339,26 +4357,29 @@ 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"
+			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 FALSE;
-#line 4347 "GSettingsEngine.c"
+			return _tmp8_;
+#line 4367 "GSettingsEngine.c"
 		} else {
+			gboolean _tmp9_ = FALSE;
 #line 352 "/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);
 #line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
 #line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-			return FALSE;
-#line 4355 "GSettingsEngine.c"
+			return _tmp9_;
+#line 4376 "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 4362 "GSettingsEngine.c"
+#line 4383 "GSettingsEngine.c"
 }
 
 
@@ -4405,7 +4426,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 4409 "GSettingsEngine.c"
+#line 4430 "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);
@@ -4413,14 +4434,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 4417 "GSettingsEngine.c"
+#line 4438 "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 4424 "GSettingsEngine.c"
+#line 4445 "GSettingsEngine.c"
 }
 
 
@@ -4464,26 +4485,29 @@ 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"
+			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 0.0;
-#line 4472 "GSettingsEngine.c"
+			return _tmp8_;
+#line 4495 "GSettingsEngine.c"
 		} else {
+			gdouble _tmp9_ = 0.0;
 #line 361 "/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);
 #line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
 #line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-			return 0.0;
-#line 4480 "GSettingsEngine.c"
+			return _tmp9_;
+#line 4504 "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 4487 "GSettingsEngine.c"
+#line 4511 "GSettingsEngine.c"
 }
 
 
@@ -4530,7 +4554,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 4534 "GSettingsEngine.c"
+#line 4558 "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);
@@ -4538,14 +4562,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 4542 "GSettingsEngine.c"
+#line 4566 "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 4549 "GSettingsEngine.c"
+#line 4573 "GSettingsEngine.c"
 }
 
 
@@ -4556,6 +4580,7 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
+	gboolean _tmp13_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -4573,7 +4598,7 @@ 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 4577 "GSettingsEngine.c"
+#line 4602 "GSettingsEngine.c"
 	{
 		gboolean _tmp3_ = FALSE;
 		const gchar* _tmp4_ = NULL;
@@ -4597,9 +4622,11 @@ 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"
+			gboolean _tmp9_ = FALSE;
 #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4603 "GSettingsEngine.c"
+#line 4630 "GSettingsEngine.c"
 				goto __catch205_configuration_error;
 			}
 #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4609,8 +4636,8 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
 #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-			return FALSE;
-#line 4614 "GSettingsEngine.c"
+			return _tmp9_;
+#line 4641 "GSettingsEngine.c"
 		}
 #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp3_;
@@ -4618,36 +4645,36 @@ 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 4622 "GSettingsEngine.c"
+#line 4649 "GSettingsEngine.c"
 	}
 	goto __finally205;
 	__catch205_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
+		GError* _tmp10_ = NULL;
+		const gchar* _tmp11_ = NULL;
+		gboolean _tmp12_ = FALSE;
 #line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
 #line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
 #line 375 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_tmp9_ = err;
+		_tmp10_ = err;
 #line 375 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_tmp10_ = _tmp9_->message;
+		_tmp11_ = _tmp10_->message;
 #line 375 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:375: GSettingsConfigurationEngine: error: %s", _tmp10_);
+		g_critical ("GSettingsEngine.vala:375: GSettingsConfigurationEngine: error: %s", _tmp11_);
 #line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_tmp11_ = def;
+		_tmp12_ = def;
 #line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		result = _tmp11_;
+		result = _tmp12_;
 #line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
 #line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
 #line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 4651 "GSettingsEngine.c"
+#line 4678 "GSettingsEngine.c"
 	}
 	__finally205:
 #line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4657,8 +4684,8 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 #line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_clear_error (&_inner_error_);
 #line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	return FALSE;
-#line 4662 "GSettingsEngine.c"
+	return _tmp13_;
+#line 4689 "GSettingsEngine.c"
 }
 
 
@@ -4685,7 +4712,7 @@ 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 4689 "GSettingsEngine.c"
+#line 4716 "GSettingsEngine.c"
 	{
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
@@ -4707,7 +4734,7 @@ 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 4711 "GSettingsEngine.c"
+#line 4738 "GSettingsEngine.c"
 				goto __catch206_configuration_error;
 			}
 #line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4718,7 +4745,7 @@ 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 4722 "GSettingsEngine.c"
+#line 4749 "GSettingsEngine.c"
 		}
 	}
 	goto __finally206;
@@ -4739,7 +4766,7 @@ 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 4743 "GSettingsEngine.c"
+#line 4770 "GSettingsEngine.c"
 	}
 	__finally206:
 #line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4752,11 +4779,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 4756 "GSettingsEngine.c"
+#line 4783 "GSettingsEngine.c"
 	}
 #line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 4760 "GSettingsEngine.c"
+#line 4787 "GSettingsEngine.c"
 }
 
 
@@ -4767,6 +4794,7 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
+	gdouble _tmp13_ = 0.0;
 	GError * _inner_error_ = NULL;
 #line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -4784,7 +4812,7 @@ 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 4788 "GSettingsEngine.c"
+#line 4816 "GSettingsEngine.c"
 	{
 		gdouble _tmp3_ = 0.0;
 		const gchar* _tmp4_ = NULL;
@@ -4808,9 +4836,11 @@ 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"
+			gdouble _tmp9_ = 0.0;
 #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4814 "GSettingsEngine.c"
+#line 4844 "GSettingsEngine.c"
 				goto __catch207_configuration_error;
 			}
 #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4820,8 +4850,8 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
 #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-			return 0.0;
-#line 4825 "GSettingsEngine.c"
+			return _tmp9_;
+#line 4855 "GSettingsEngine.c"
 		}
 #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp3_;
@@ -4829,36 +4859,36 @@ 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 4833 "GSettingsEngine.c"
+#line 4863 "GSettingsEngine.c"
 	}
 	goto __finally207;
 	__catch207_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		gdouble _tmp11_ = 0.0;
+		GError* _tmp10_ = NULL;
+		const gchar* _tmp11_ = NULL;
+		gdouble _tmp12_ = 0.0;
 #line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
 #line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
 #line 396 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_tmp9_ = err;
+		_tmp10_ = err;
 #line 396 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_tmp10_ = _tmp9_->message;
+		_tmp11_ = _tmp10_->message;
 #line 396 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:396: GSettingsConfigurationEngine: error: %s", _tmp10_);
+		g_critical ("GSettingsEngine.vala:396: GSettingsConfigurationEngine: error: %s", _tmp11_);
 #line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_tmp11_ = def;
+		_tmp12_ = def;
 #line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		result = _tmp11_;
+		result = _tmp12_;
 #line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
 #line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
 #line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 4862 "GSettingsEngine.c"
+#line 4892 "GSettingsEngine.c"
 	}
 	__finally207:
 #line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4868,8 +4898,8 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 #line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_clear_error (&_inner_error_);
 #line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	return 0.0;
-#line 4873 "GSettingsEngine.c"
+	return _tmp13_;
+#line 4903 "GSettingsEngine.c"
 }
 
 
@@ -4896,7 +4926,7 @@ 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 4900 "GSettingsEngine.c"
+#line 4930 "GSettingsEngine.c"
 	{
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
@@ -4918,7 +4948,7 @@ 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 4922 "GSettingsEngine.c"
+#line 4952 "GSettingsEngine.c"
 				goto __catch208_configuration_error;
 			}
 #line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4929,7 +4959,7 @@ 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 4933 "GSettingsEngine.c"
+#line 4963 "GSettingsEngine.c"
 		}
 	}
 	goto __finally208;
@@ -4950,7 +4980,7 @@ 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 4954 "GSettingsEngine.c"
+#line 4984 "GSettingsEngine.c"
 	}
 	__finally208:
 #line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4963,11 +4993,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 4967 "GSettingsEngine.c"
+#line 4997 "GSettingsEngine.c"
 	}
 #line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 4971 "GSettingsEngine.c"
+#line 5001 "GSettingsEngine.c"
 }
 
 
@@ -4978,6 +5008,7 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
+	gint _tmp13_ = 0;
 	GError * _inner_error_ = NULL;
 #line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
@@ -4995,7 +5026,7 @@ 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 4999 "GSettingsEngine.c"
+#line 5030 "GSettingsEngine.c"
 	{
 		gint _tmp3_ = 0;
 		const gchar* _tmp4_ = NULL;
@@ -5019,9 +5050,11 @@ 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"
+			gint _tmp9_ = 0;
 #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5025 "GSettingsEngine.c"
+#line 5058 "GSettingsEngine.c"
 				goto __catch209_configuration_error;
 			}
 #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5031,8 +5064,8 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
 #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-			return 0;
-#line 5036 "GSettingsEngine.c"
+			return _tmp9_;
+#line 5069 "GSettingsEngine.c"
 		}
 #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp3_;
@@ -5040,36 +5073,36 @@ 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 5044 "GSettingsEngine.c"
+#line 5077 "GSettingsEngine.c"
 	}
 	goto __finally209;
 	__catch209_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
+		GError* _tmp10_ = NULL;
+		const gchar* _tmp11_ = NULL;
+		gint _tmp12_ = 0;
 #line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
 #line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
 #line 417 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_tmp9_ = err;
+		_tmp10_ = err;
 #line 417 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_tmp10_ = _tmp9_->message;
+		_tmp11_ = _tmp10_->message;
 #line 417 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:417: GSettingsConfigurationEngine: error: %s", _tmp10_);
+		g_critical ("GSettingsEngine.vala:417: GSettingsConfigurationEngine: error: %s", _tmp11_);
 #line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_tmp11_ = def;
+		_tmp12_ = def;
 #line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		result = _tmp11_;
+		result = _tmp12_;
 #line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
 #line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
 #line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 5073 "GSettingsEngine.c"
+#line 5106 "GSettingsEngine.c"
 	}
 	__finally209:
 #line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5079,8 +5112,8 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 #line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_clear_error (&_inner_error_);
 #line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	return 0;
-#line 5084 "GSettingsEngine.c"
+	return _tmp13_;
+#line 5117 "GSettingsEngine.c"
 }
 
 
@@ -5107,7 +5140,7 @@ 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 5111 "GSettingsEngine.c"
+#line 5144 "GSettingsEngine.c"
 	{
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
@@ -5129,7 +5162,7 @@ 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 5133 "GSettingsEngine.c"
+#line 5166 "GSettingsEngine.c"
 				goto __catch210_configuration_error;
 			}
 #line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5140,7 +5173,7 @@ 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 5144 "GSettingsEngine.c"
+#line 5177 "GSettingsEngine.c"
 		}
 	}
 	goto __finally210;
@@ -5161,7 +5194,7 @@ 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 5165 "GSettingsEngine.c"
+#line 5198 "GSettingsEngine.c"
 	}
 	__finally210:
 #line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5174,11 +5207,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 5178 "GSettingsEngine.c"
+#line 5211 "GSettingsEngine.c"
 	}
 #line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 5182 "GSettingsEngine.c"
+#line 5215 "GSettingsEngine.c"
 }
 
 
@@ -5206,7 +5239,7 @@ 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 5210 "GSettingsEngine.c"
+#line 5243 "GSettingsEngine.c"
 	{
 		gchar* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
@@ -5233,7 +5266,7 @@ 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 5237 "GSettingsEngine.c"
+#line 5270 "GSettingsEngine.c"
 				goto __catch211_configuration_error;
 			}
 #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5244,7 +5277,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 5248 "GSettingsEngine.c"
+#line 5281 "GSettingsEngine.c"
 		}
 #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp9_ = _tmp3_;
@@ -5258,7 +5291,7 @@ 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 5262 "GSettingsEngine.c"
+#line 5295 "GSettingsEngine.c"
 	}
 	goto __finally211;
 	__catch211_configuration_error:
@@ -5290,7 +5323,7 @@ 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 5294 "GSettingsEngine.c"
+#line 5327 "GSettingsEngine.c"
 	}
 	__finally211:
 #line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5301,7 +5334,7 @@ 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 5305 "GSettingsEngine.c"
+#line 5338 "GSettingsEngine.c"
 }
 
 
@@ -5328,7 +5361,7 @@ 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 5332 "GSettingsEngine.c"
+#line 5365 "GSettingsEngine.c"
 	{
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
@@ -5350,7 +5383,7 @@ 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 5354 "GSettingsEngine.c"
+#line 5387 "GSettingsEngine.c"
 				goto __catch212_configuration_error;
 			}
 #line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5361,7 +5394,7 @@ 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 5365 "GSettingsEngine.c"
+#line 5398 "GSettingsEngine.c"
 		}
 	}
 	goto __finally212;
@@ -5382,7 +5415,7 @@ 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 5386 "GSettingsEngine.c"
+#line 5419 "GSettingsEngine.c"
 	}
 	__finally212:
 #line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5395,11 +5428,11 @@ 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 5399 "GSettingsEngine.c"
+#line 5432 "GSettingsEngine.c"
 	}
 #line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 5403 "GSettingsEngine.c"
+#line 5436 "GSettingsEngine.c"
 }
 
 
@@ -5426,7 +5459,7 @@ 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 5430 "GSettingsEngine.c"
+#line 5463 "GSettingsEngine.c"
 	{
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
@@ -5445,7 +5478,7 @@ 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 5449 "GSettingsEngine.c"
+#line 5482 "GSettingsEngine.c"
 				goto __catch213_configuration_error;
 			}
 #line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5456,7 +5489,7 @@ 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 5460 "GSettingsEngine.c"
+#line 5493 "GSettingsEngine.c"
 		}
 	}
 	goto __finally213;
@@ -5477,7 +5510,7 @@ 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 5481 "GSettingsEngine.c"
+#line 5514 "GSettingsEngine.c"
 	}
 	__finally213:
 #line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5490,11 +5523,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 5494 "GSettingsEngine.c"
+#line 5527 "GSettingsEngine.c"
 	}
 #line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 5498 "GSettingsEngine.c"
+#line 5531 "GSettingsEngine.c"
 }
 
 
@@ -5515,7 +5548,7 @@ 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 5519 "GSettingsEngine.c"
+#line 5552 "GSettingsEngine.c"
 	{
 		FuzzyPropertyState _tmp2_ = 0;
 		gboolean _tmp3_ = FALSE;
@@ -5528,7 +5561,7 @@ 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 5532 "GSettingsEngine.c"
+#line 5565 "GSettingsEngine.c"
 				goto __catch214_configuration_error;
 			}
 #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5539,17 +5572,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 5543 "GSettingsEngine.c"
+#line 5576 "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 5549 "GSettingsEngine.c"
+#line 5582 "GSettingsEngine.c"
 		} else {
 #line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_tmp2_ = FUZZY_PROPERTY_STATE_DISABLED;
-#line 5553 "GSettingsEngine.c"
+#line 5586 "GSettingsEngine.c"
 		}
 #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp2_;
@@ -5557,7 +5590,7 @@ 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 5561 "GSettingsEngine.c"
+#line 5594 "GSettingsEngine.c"
 	}
 	goto __finally214;
 	__catch214_configuration_error:
@@ -5583,7 +5616,7 @@ 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 5587 "GSettingsEngine.c"
+#line 5620 "GSettingsEngine.c"
 	}
 	__finally214:
 #line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5594,7 +5627,7 @@ 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 5598 "GSettingsEngine.c"
+#line 5631 "GSettingsEngine.c"
 }
 
 
@@ -5614,7 +5647,7 @@ 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 5618 "GSettingsEngine.c"
+#line 5651 "GSettingsEngine.c"
 	{
 		gboolean _tmp2_ = FALSE;
 #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5625,7 +5658,7 @@ 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 5629 "GSettingsEngine.c"
+#line 5662 "GSettingsEngine.c"
 				goto __catch215_configuration_error;
 			}
 #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5636,7 +5669,7 @@ 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 5640 "GSettingsEngine.c"
+#line 5673 "GSettingsEngine.c"
 		}
 	}
 	goto __finally215;
@@ -5657,7 +5690,7 @@ 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 5661 "GSettingsEngine.c"
+#line 5694 "GSettingsEngine.c"
 	}
 	__finally215:
 #line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5670,11 +5703,11 @@ 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 5674 "GSettingsEngine.c"
+#line 5707 "GSettingsEngine.c"
 	}
 #line 475 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (enable_disable_name);
-#line 5678 "GSettingsEngine.c"
+#line 5711 "GSettingsEngine.c"
 }
 
 
@@ -5705,13 +5738,13 @@ 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 5709 "GSettingsEngine.c"
+#line 5742 "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 5715 "GSettingsEngine.c"
+#line 5748 "GSettingsEngine.c"
 			goto __catch216_g_error;
 		}
 	}
@@ -5733,7 +5766,7 @@ 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 5737 "GSettingsEngine.c"
+#line 5770 "GSettingsEngine.c"
 	}
 	__finally216:
 #line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5746,11 +5779,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 5750 "GSettingsEngine.c"
+#line 5783 "GSettingsEngine.c"
 	}
 #line 489 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (cmd_line);
-#line 5754 "GSettingsEngine.c"
+#line 5787 "GSettingsEngine.c"
 }
 
 
@@ -5761,7 +5794,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 5765 "GSettingsEngine.c"
+#line 5798 "GSettingsEngine.c"
 }
 
 
@@ -5812,14 +5845,14 @@ static void gsettings_configuration_engine_configuration_engine_interface_init (
 	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 5816 "GSettingsEngine.c"
+#line 5849 "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 5823 "GSettingsEngine.c"
+#line 5856 "GSettingsEngine.c"
 }
 
 
@@ -5833,7 +5866,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 5837 "GSettingsEngine.c"
+#line 5870 "GSettingsEngine.c"
 }
 
 
diff --git a/src/core/Alteration.c b/src/core/Alteration.c
index e9e435b..b1e62b6 100644
--- a/src/core/Alteration.c
+++ b/src/core/Alteration.c
@@ -1,4 +1,4 @@
-/* Alteration.c generated by valac 0.34.4, the Vala compiler
+/* Alteration.c generated by valac 0.34.7, the Vala compiler
  * generated from Alteration.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -635,7 +635,7 @@ static GeeMultiMap* alteration_create_map (Alteration* self) {
 #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"
-	_tmp0_ = gee_hash_multi_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, _alteration_case_hash_gee_hash_data_func, NULL, NULL, _alteration_case_equal_gee_equal_data_func, NULL, NULL, _alteration_case_hash_gee_hash_data_func, NULL, NULL, _alteration_case_equal_gee_equal_data_func, NULL, NULL);
+	_tmp0_ = gee_hash_multi_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, _alteration_case_hash_gee_hash_data_func, NULL, NULL, _alteration_case_equal_gee_equal_data_func, NULL, NULL, _alteration_case_hash_gee_hash_data_func, NULL, NULL, _alteration_case_equal_gee_equal_data_func, NULL, NULL);
 #line 102 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
 #line 102 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1065,7 +1065,7 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) {
 		GeeArrayList* _tmp8_ = NULL;
 		const gchar* _tmp9_ = NULL;
 #line 155 "/home/jens/Source/shotwell/src/core/Alteration.vala"
-		_tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+		_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"
 		details = _tmp7_;
 #line 156 "/home/jens/Source/shotwell/src/core/Alteration.vala"
diff --git a/src/core/ContainerSourceCollection.c b/src/core/ContainerSourceCollection.c
index 26d26bd..247e471 100644
--- a/src/core/ContainerSourceCollection.c
+++ b/src/core/ContainerSourceCollection.c
@@ -1,4 +1,4 @@
-/* ContainerSourceCollection.c generated by valac 0.34.4, the Vala compiler
+/* ContainerSourceCollection.c generated by valac 0.34.7, the Vala compiler
  * generated from ContainerSourceCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -869,7 +869,7 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
 #line 124 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	container_source_collection_freeze_attached_notifications (self);
 #line 126 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	_tmp0_ = gee_hash_multi_map_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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"
@@ -1125,7 +1125,7 @@ static void container_source_collection_on_contained_sources_relinked (Container
 #line 147 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	container_source_collection_freeze_attached_notifications (self);
 #line 149 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	_tmp0_ = gee_hash_multi_map_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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"
@@ -2039,21 +2039,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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -2080,11 +2080,11 @@ static void container_source_collection_instance_init (ContainerSourceCollection
 #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"
-	_tmp0_ = gee_hash_set_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_set_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 16 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
 	self->priv->attached_collections = _tmp0_;
 #line 18 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
-	_tmp1_ = gee_hash_set_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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"
diff --git a/src/core/Core.c b/src/core/Core.c
index 7316e4d..d67d1ab 100644
--- a/src/core/Core.c
+++ b/src/core/Core.c
@@ -1,4 +1,4 @@
-/* Core.c generated by valac 0.34.4, the Vala compiler
+/* Core.c generated by valac 0.34.7, 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 6f03093..21c509f 100644
--- a/src/core/DataCollection.c
+++ b/src/core/DataCollection.c
@@ -1,4 +1,4 @@
-/* DataCollection.c generated by valac 0.34.4, the Vala compiler
+/* DataCollection.c generated by valac 0.34.7, the Vala compiler
  * generated from DataCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -589,7 +589,7 @@ GeeCollection* data_collection_get_singleton (DataObject* object) {
 #line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp0_ = object;
 #line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	_tmp1_ = singleton_collection_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp0_);
+	_tmp1_ = singleton_collection_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_);
 #line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 207 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -609,7 +609,7 @@ GeeMap* data_collection_get_alteration_singleton (DataObject* object, Alteration
 #line 210 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	g_return_val_if_fail (IS_ALTERATION (alteration), NULL);
 #line 212 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	_tmp0_ = gee_hash_map_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_ALTERATION, (GBoxedCopyFunc) alteration_ref, alteration_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = 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 212 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	map = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap);
 #line 213 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1259,7 +1259,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
 #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, g_object_unref, NULL, NULL, NULL);
+	_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"
@@ -1352,7 +1352,7 @@ static GeeCollection* data_collection_real_add_many (DataCollection* self, GeeCo
 #line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp16_ = added;
 #line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	_tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp18_ = _tmp17_;
 #line 343 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1572,7 +1572,7 @@ void data_collection_act_on_marked (DataCollection* self, Marker* m, MarkedActio
 #line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp6_ = _tmp5_->marked;
 #line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp8_ = _tmp7_;
 #line 393 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1829,7 +1829,7 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
 #line 1828 "DataCollection.c"
 					GeeArrayList* _tmp18_ = NULL;
 #line 435 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-					_tmp18_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_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"
@@ -1883,7 +1883,7 @@ static void data_collection_real_remove_marked (DataCollection* self, Marker* m)
 #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp27_ = _tmp26_->marked;
 #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	_tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	_tmp29_ = _tmp28_;
 #line 449 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -1996,7 +1996,7 @@ static void data_collection_real_clear (DataCollection* self) {
 #line 1995 "DataCollection.c"
 	}
 #line 468 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	_tmp2_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
@@ -2084,7 +2084,7 @@ static void data_collection_real_clear (DataCollection* self) {
 #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp16_ = _object_list;
 #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-		_tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp18_ = _tmp17_;
 #line 482 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -2233,7 +2233,7 @@ void data_collection_internal_notify_altered (DataCollection* self, DataObject*
 #line 2232 "DataCollection.c"
 			GeeHashMap* _tmp8_ = NULL;
 #line 505 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-			_tmp8_ = gee_hash_map_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_ALTERATION, (GBoxedCopyFunc) alteration_ref, alteration_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+			_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"
@@ -2897,7 +2897,7 @@ static void g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED (GClosure * closure
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	callback = (GMarshalFunc_VOID__STRING_BOXED_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_boxed (param_values + 2), g_value_get_boxed (param_values + 3), data2);
+	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"
 }
 
@@ -3319,7 +3319,7 @@ static gint data_collection_marker_impl_real_get_count (Marker* base) {
 #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp2_ = self->marked;
 #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp4_ = _tmp3_;
 #line 73 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3350,7 +3350,7 @@ static GeeCollection* data_collection_marker_impl_real_get_all (Marker* base) {
 #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"
-	_tmp0_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 77 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	copy = _tmp0_;
 #line 78 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3454,7 +3454,7 @@ static void data_collection_marker_impl_finished (DataCollectionMarkerImpl* self
 #line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp1_ = self->marked;
 #line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-		_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 		_tmp3_ = _tmp2_;
 #line 97 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3539,7 +3539,7 @@ static void data_collection_marker_impl_marker_interface_init (MarkerIface * ifa
 static void data_collection_marker_impl_instance_init (DataCollectionMarkerImpl * self) {
 	GeeHashSet* _tmp0_ = NULL;
 #line 12 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	_tmp0_ = gee_hash_set_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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"
@@ -3772,51 +3772,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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -3846,7 +3846,7 @@ static void data_collection_class_init (DataCollectionClass * klass) {
 #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);
 #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_VALUE, G_TYPE_VALUE);
+	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);
 #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);
 #line 7 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
@@ -3867,7 +3867,7 @@ static void data_collection_instance_init (DataCollection * self) {
 #line 108 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	self->priv->dataset = _tmp0_;
 #line 109 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
-	_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_VALUE, (GBoxedCopyFunc) _g_value_dup, _vala_GValue_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_VALUE, (GBoxedCopyFunc) _g_value_dup, (GDestroyNotify) _vala_GValue_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 109 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
 	self->priv->properties = _tmp1_;
 #line 110 "/home/jens/Source/shotwell/src/core/DataCollection.vala"
diff --git a/src/core/DataObject.c b/src/core/DataObject.c
index 372fce2..58505c6 100644
--- a/src/core/DataObject.c
+++ b/src/core/DataObject.c
@@ -1,4 +1,4 @@
-/* DataObject.c generated by valac 0.34.4, the Vala compiler
+/* DataObject.c generated by valac 0.34.7, the Vala compiler
  * generated from DataObject.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 = 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 = 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 = 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 = 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 = 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"
diff --git a/src/core/DataSet.c b/src/core/DataSet.c
index d0a3119..a6ea6b0 100644
--- a/src/core/DataSet.c
+++ b/src/core/DataSet.c
@@ -1,4 +1,4 @@
-/* DataSet.c generated by valac 0.34.4, the Vala compiler
+/* DataSet.c generated by valac 0.34.7, the Vala compiler
  * generated from DataSet.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1090,11 +1090,11 @@ static void data_set_instance_init (DataSet * self) {
 #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"
-	_tmp0_ = sorted_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL);
+	_tmp0_ = sorted_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL);
 #line 30 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	self->priv->list = _tmp0_;
 #line 31 "/home/jens/Source/shotwell/src/core/DataSet.vala"
-	_tmp1_ = gee_hash_set_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp1_ = gee_hash_set_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 31 "/home/jens/Source/shotwell/src/core/DataSet.vala"
 	self->priv->hash_set = _tmp1_;
 #line 32 "/home/jens/Source/shotwell/src/core/DataSet.vala"
diff --git a/src/core/DataSource.c b/src/core/DataSource.c
index 4d1d881..c95b8ce 100644
--- a/src/core/DataSource.c
+++ b/src/core/DataSource.c
@@ -1,4 +1,4 @@
-/* DataSource.c generated by valac 0.34.4, the Vala compiler
+/* DataSource.c generated by valac 0.34.7, the Vala compiler
  * generated from DataSource.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -695,7 +695,7 @@ static void data_source_real_notify_unlinking (DataSource* self, SourceCollectio
 #line 118 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self->priv->unlinked_from_collection = _tmp3_;
 #line 119 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	_tmp4_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp4_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 119 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_g_object_unref0 (self->priv->backlinks);
 #line 119 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -745,7 +745,7 @@ static void data_source_real_notify_unlinked (DataSource* self) {
 #line 129 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp4_ = self->priv->backlinks;
 #line 129 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	_tmp5_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_MAP, GeeMap));
+	_tmp5_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 129 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp6_ = _tmp5_;
 #line 129 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -898,11 +898,12 @@ gchar* data_source_get_typename (DataSource* self) {
 
 
 static gint64 data_source_real_get_instance_id (DataSource* self) {
+	gint64 _tmp0_ = 0LL;
 #line 162 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	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 0LL;
-#line 906 "DataSource.c"
+	return _tmp0_;
+#line 907 "DataSource.c"
 }
 
 
@@ -911,7 +912,7 @@ 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 915 "DataSource.c"
+#line 916 "DataSource.c"
 }
 
 
@@ -938,7 +939,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 942 "DataSource.c"
+#line 943 "DataSource.c"
 }
 
 
@@ -947,7 +948,7 @@ 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 951 "DataSource.c"
+#line 952 "DataSource.c"
 }
 
 
@@ -974,7 +975,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 978 "DataSource.c"
+#line 979 "DataSource.c"
 	}
 #line 174 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp1_ = self->priv->backlinks;
@@ -992,7 +993,7 @@ 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 996 "DataSource.c"
+#line 997 "DataSource.c"
 		GeeList* _tmp8_ = NULL;
 		SourceBacklink* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
@@ -1010,11 +1011,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 1014 "DataSource.c"
+#line 1015 "DataSource.c"
 	} else {
 #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp6_ = FALSE;
-#line 1018 "DataSource.c"
+#line 1019 "DataSource.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	result = _tmp6_;
@@ -1022,14 +1023,14 @@ 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 1026 "DataSource.c"
+#line 1027 "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 1033 "DataSource.c"
+#line 1034 "DataSource.c"
 }
 
 
@@ -1056,7 +1057,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 1060 "DataSource.c"
+#line 1061 "DataSource.c"
 	}
 #line 183 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp1_ = self->priv->backlinks;
@@ -1072,7 +1073,7 @@ 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 1076 "DataSource.c"
+#line 1077 "DataSource.c"
 	} else {
 		GeeList* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
@@ -1085,7 +1086,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 1089 "DataSource.c"
+#line 1090 "DataSource.c"
 	}
 #line 184 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp4_) {
@@ -1095,13 +1096,13 @@ 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 1099 "DataSource.c"
+#line 1100 "DataSource.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	_tmp9_ = gee_array_list_new (TYPE_SOURCE_BACKLINK, (GBoxedCopyFunc) source_backlink_ref, source_backlink_unref, NULL, NULL, NULL);
+	_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 1105 "DataSource.c"
+#line 1106 "DataSource.c"
 	{
 		GeeList* _value_list = NULL;
 		GeeList* _tmp10_ = NULL;
@@ -1129,7 +1130,7 @@ 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 1133 "DataSource.c"
+#line 1134 "DataSource.c"
 			gint _tmp15_ = 0;
 			gint _tmp16_ = 0;
 			gint _tmp17_ = 0;
@@ -1154,7 +1155,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 1158 "DataSource.c"
+#line 1159 "DataSource.c"
 			}
 #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp18_ = _value_list;
@@ -1180,11 +1181,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 1184 "DataSource.c"
+#line 1185 "DataSource.c"
 		}
 #line 188 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_g_object_unref0 (_value_list);
-#line 1188 "DataSource.c"
+#line 1189 "DataSource.c"
 	}
 #line 191 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	result = backlinks;
@@ -1192,7 +1193,7 @@ 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 1196 "DataSource.c"
+#line 1197 "DataSource.c"
 }
 
 
@@ -1236,7 +1237,7 @@ 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 1240 "DataSource.c"
+#line 1241 "DataSource.c"
 		GeeArrayList* _tmp7_ = NULL;
 		GeeHashMap* _tmp8_ = NULL;
 		SourceBacklink* _tmp9_ = NULL;
@@ -1244,7 +1245,7 @@ void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) {
 		const gchar* _tmp11_ = NULL;
 		GeeList* _tmp12_ = NULL;
 #line 200 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-		_tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+		_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"
 		_g_object_unref0 (values);
 #line 200 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1261,7 +1262,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 1265 "DataSource.c"
+#line 1266 "DataSource.c"
 	}
 #line 204 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp13_ = values;
@@ -1281,7 +1282,7 @@ 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 1285 "DataSource.c"
+#line 1286 "DataSource.c"
 		SourceCollection* _tmp19_ = NULL;
 		SourceBacklink* _tmp20_ = NULL;
 #line 208 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1290,13 +1291,13 @@ void data_source_set_backlink (DataSource* self, SourceBacklink* backlink) {
 		_tmp20_ = backlink;
 #line 208 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		source_collection_internal_backlink_set (_tmp19_, self, _tmp20_);
-#line 1294 "DataSource.c"
+#line 1295 "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 1300 "DataSource.c"
+#line 1301 "DataSource.c"
 }
 
 
@@ -1343,7 +1344,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 1347 "DataSource.c"
+#line 1348 "DataSource.c"
 	}
 #line 215 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp1_ = self->priv->backlinks;
@@ -1367,7 +1368,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 1371 "DataSource.c"
+#line 1372 "DataSource.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp7_ = values;
@@ -1389,7 +1390,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
 	iter = _tmp12_;
 #line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	while (TRUE) {
-#line 1393 "DataSource.c"
+#line 1394 "DataSource.c"
 		GeeIterator* _tmp13_ = NULL;
 		gboolean _tmp14_ = FALSE;
 		GeeIterator* _tmp15_ = NULL;
@@ -1407,7 +1408,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
 		if (!_tmp14_) {
 #line 223 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			break;
-#line 1411 "DataSource.c"
+#line 1412 "DataSource.c"
 		}
 #line 224 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp15_ = iter;
@@ -1427,13 +1428,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 1431 "DataSource.c"
+#line 1432 "DataSource.c"
 			GeeIterator* _tmp22_ = NULL;
 #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 1437 "DataSource.c"
+#line 1438 "DataSource.c"
 		}
 	}
 #line 228 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1444,7 +1445,7 @@ 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 1448 "DataSource.c"
+#line 1449 "DataSource.c"
 		GeeHashMap* _tmp26_ = NULL;
 		SourceBacklink* _tmp27_ = NULL;
 		const gchar* _tmp28_ = NULL;
@@ -1459,7 +1460,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 1463 "DataSource.c"
+#line 1464 "DataSource.c"
 	}
 #line 233 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp30_ = self->priv->unlinked_from_collection;
@@ -1479,7 +1480,7 @@ 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 1483 "DataSource.c"
+#line 1484 "DataSource.c"
 		SourceCollection* _tmp35_ = NULL;
 		SourceBacklink* _tmp36_ = NULL;
 #line 237 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1488,7 +1489,7 @@ gboolean data_source_remove_backlink (DataSource* self, SourceBacklink* backlink
 		_tmp36_ = backlink;
 #line 237 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		source_collection_internal_backlink_removed (_tmp35_, self, _tmp36_);
-#line 1492 "DataSource.c"
+#line 1493 "DataSource.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp37_ = values;
@@ -1508,7 +1509,7 @@ 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 1512 "DataSource.c"
+#line 1513 "DataSource.c"
 }
 
 
@@ -1523,18 +1524,18 @@ 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 1527 "DataSource.c"
+#line 1528 "DataSource.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
 #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 1534 "DataSource.c"
+#line 1535 "DataSource.c"
 	}
 #line 249 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp0_) {
-#line 1538 "DataSource.c"
+#line 1539 "DataSource.c"
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 #line 250 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1545,7 +1546,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 1549 "DataSource.c"
+#line 1550 "DataSource.c"
 	}
 }
 
@@ -1555,7 +1556,7 @@ 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 1559 "DataSource.c"
+#line 1560 "DataSource.c"
 }
 
 
@@ -1579,7 +1580,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 	if (_tmp1_ == NULL) {
 #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp0_ = TRUE;
-#line 1583 "DataSource.c"
+#line 1584 "DataSource.c"
 	} else {
 		GeeHashMap* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
@@ -1587,12 +1588,12 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp2_ = self->priv->backlinks;
 #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-		_tmp3_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MAP, GeeMap));
+		_tmp3_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp4_ = _tmp3_;
 #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp0_ = _tmp4_ == 0;
-#line 1596 "DataSource.c"
+#line 1597 "DataSource.c"
 	}
 #line 254 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp0_) {
@@ -1600,13 +1601,13 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 		result = NULL;
 #line 255 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		return result;
-#line 1604 "DataSource.c"
+#line 1605 "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 1610 "DataSource.c"
+#line 1611 "DataSource.c"
 	{
 		GeeIterator* _name_it = NULL;
 		GeeHashMap* _tmp6_ = NULL;
@@ -1618,7 +1619,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp6_ = self->priv->backlinks;
 #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-		_tmp7_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_MAP, GeeMap));
+		_tmp7_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp8_ = _tmp7_;
 #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1633,7 +1634,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 		_name_it = _tmp11_;
 #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		while (TRUE) {
-#line 1637 "DataSource.c"
+#line 1638 "DataSource.c"
 			GeeIterator* _tmp12_ = NULL;
 			gboolean _tmp13_ = FALSE;
 			gchar* name = NULL;
@@ -1658,7 +1659,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 			if (!_tmp13_) {
 #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				break;
-#line 1662 "DataSource.c"
+#line 1663 "DataSource.c"
 			}
 #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp14_ = _name_it;
@@ -1680,7 +1681,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 			if (_tmp20_ == NULL) {
 #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp19_ = TRUE;
-#line 1684 "DataSource.c"
+#line 1685 "DataSource.c"
 			} else {
 				GeeList* _tmp21_ = NULL;
 				gint _tmp22_ = 0;
@@ -1693,7 +1694,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 1697 "DataSource.c"
+#line 1698 "DataSource.c"
 			}
 #line 260 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			if (_tmp19_) {
@@ -1703,13 +1704,13 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 				_g_free0 (name);
 #line 261 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				continue;
-#line 1707 "DataSource.c"
+#line 1708 "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 1713 "DataSource.c"
+#line 1714 "DataSource.c"
 			{
 				GeeList* _value_list = NULL;
 				GeeList* _tmp25_ = NULL;
@@ -1737,7 +1738,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 				_value_index = -1;
 #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				while (TRUE) {
-#line 1741 "DataSource.c"
+#line 1742 "DataSource.c"
 					gint _tmp30_ = 0;
 					gint _tmp31_ = 0;
 					gint _tmp32_ = 0;
@@ -1759,7 +1760,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 					if (!(_tmp31_ < _tmp32_)) {
 #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 						break;
-#line 1763 "DataSource.c"
+#line 1764 "DataSource.c"
 					}
 #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					_tmp33_ = _value_list;
@@ -1775,7 +1776,7 @@ 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 1779 "DataSource.c"
+#line 1780 "DataSource.c"
 						const gchar* _tmp38_ = NULL;
 						const gchar* _tmp39_ = NULL;
 						gchar* _tmp40_ = NULL;
@@ -1797,15 +1798,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 1801 "DataSource.c"
+#line 1802 "DataSource.c"
 					}
 #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 					_g_free0 (value);
-#line 1805 "DataSource.c"
+#line 1806 "DataSource.c"
 				}
 #line 264 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_g_object_unref0 (_value_list);
-#line 1809 "DataSource.c"
+#line 1810 "DataSource.c"
 			}
 #line 269 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp43_ = value_field;
@@ -1815,7 +1816,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 			_tmp45_ = _tmp44_;
 #line 269 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			if (_tmp45_ > 0) {
-#line 1819 "DataSource.c"
+#line 1820 "DataSource.c"
 				GString* _tmp46_ = NULL;
 				const gchar* _tmp47_ = NULL;
 				const gchar* _tmp48_ = NULL;
@@ -1835,7 +1836,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 1839 "DataSource.c"
+#line 1840 "DataSource.c"
 			}
 #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_g_free0 (value_field);
@@ -1843,11 +1844,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 1847 "DataSource.c"
+#line 1848 "DataSource.c"
 		}
 #line 258 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_g_object_unref0 (_name_it);
-#line 1851 "DataSource.c"
+#line 1852 "DataSource.c"
 	}
 #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp52_ = builder;
@@ -1859,7 +1860,7 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 	_tmp55_ = _tmp54_;
 #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp55_ > 0) {
-#line 1863 "DataSource.c"
+#line 1864 "DataSource.c"
 		GString* _tmp56_ = NULL;
 		const gchar* _tmp57_ = NULL;
 #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1868,11 +1869,11 @@ static gchar* data_source_dehydrate_backlinks (DataSource* self) {
 		_tmp57_ = _tmp56_->str;
 #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp51_ = _tmp57_;
-#line 1872 "DataSource.c"
+#line 1873 "DataSource.c"
 	} else {
 #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp51_ = NULL;
-#line 1876 "DataSource.c"
+#line 1877 "DataSource.c"
 	}
 #line 273 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp58_ = g_strdup (_tmp51_);
@@ -1882,7 +1883,7 @@ 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 1886 "DataSource.c"
+#line 1887 "DataSource.c"
 }
 
 
@@ -1907,7 +1908,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
 #line 279 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self->priv->unlinked_from_collection = _tmp0_;
 #line 280 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 280 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_g_object_unref0 (self->priv->backlinks);
 #line 280 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -1918,7 +1919,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 1922 "DataSource.c"
+#line 1923 "DataSource.c"
 	}
 #line 285 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp3_ = dehydrated;
@@ -1934,7 +1935,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 1938 "DataSource.c"
+#line 1939 "DataSource.c"
 	{
 		gchar** line_collection = NULL;
 		gint line_collection_length1 = 0;
@@ -1946,14 +1947,14 @@ 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 1950 "DataSource.c"
+#line 1951 "DataSource.c"
 			gchar* _tmp7_ = NULL;
 			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 1957 "DataSource.c"
+#line 1958 "DataSource.c"
 			{
 				const gchar* _tmp8_ = NULL;
 				gint _tmp9_ = 0;
@@ -1993,7 +1994,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 1997 "DataSource.c"
+#line 1998 "DataSource.c"
 				}
 #line 290 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp11_ = line;
@@ -2011,7 +2012,7 @@ 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 2015 "DataSource.c"
+#line 2016 "DataSource.c"
 					const gchar* _tmp15_ = NULL;
 					gchar* _tmp16_ = NULL;
 					gchar* _tmp17_ = NULL;
@@ -2032,7 +2033,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 2035 "DataSource.c"
+#line 2036 "DataSource.c"
 				}
 #line 298 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp18_ = tokens;
@@ -2049,14 +2050,14 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
 #line 298 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_decoded_values_size_ = decoded_values_length1;
 #line 299 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-				_tmp22_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+				_tmp22_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 299 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				values = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_LIST, GeeList);
 #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp23_ = decoded_values;
 #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp23__length1 = decoded_values_length1;
-#line 2059 "DataSource.c"
+#line 2060 "DataSource.c"
 				{
 					gchar** value_collection = NULL;
 					gint value_collection_length1 = 0;
@@ -2068,14 +2069,14 @@ 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 2071 "DataSource.c"
+#line 2072 "DataSource.c"
 						gchar* _tmp24_ = NULL;
 						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 2078 "DataSource.c"
+#line 2079 "DataSource.c"
 						{
 							gboolean _tmp25_ = FALSE;
 							const gchar* _tmp26_ = NULL;
@@ -2083,7 +2084,7 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
 							_tmp26_ = value;
 #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 							if (_tmp26_ != NULL) {
-#line 2086 "DataSource.c"
+#line 2087 "DataSource.c"
 								const gchar* _tmp27_ = NULL;
 								gint _tmp28_ = 0;
 								gint _tmp29_ = 0;
@@ -2095,15 +2096,15 @@ 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 2098 "DataSource.c"
+#line 2099 "DataSource.c"
 							} else {
 #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 								_tmp25_ = FALSE;
-#line 2102 "DataSource.c"
+#line 2103 "DataSource.c"
 							}
 #line 301 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 							if (_tmp25_) {
-#line 2106 "DataSource.c"
+#line 2107 "DataSource.c"
 								GeeList* _tmp30_ = NULL;
 								const gchar* _tmp31_ = NULL;
 #line 302 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2112,11 +2113,11 @@ void data_source_rehydrate_backlinks (DataSource* self, SourceCollection* unlink
 								_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 2115 "DataSource.c"
+#line 2116 "DataSource.c"
 							}
 #line 300 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 							_g_free0 (value);
-#line 2119 "DataSource.c"
+#line 2120 "DataSource.c"
 						}
 					}
 				}
@@ -2128,7 +2129,7 @@ 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 2131 "DataSource.c"
+#line 2132 "DataSource.c"
 					GeeHashMap* _tmp35_ = NULL;
 					gchar** _tmp36_ = NULL;
 					gint _tmp36__length1 = 0;
@@ -2146,7 +2147,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 2149 "DataSource.c"
+#line 2150 "DataSource.c"
 				}
 #line 286 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_g_object_unref0 (values);
@@ -2156,13 +2157,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 2159 "DataSource.c"
+#line 2160 "DataSource.c"
 			}
 		}
 	}
 #line 278 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	lines = (_vala_array_free (lines, lines_length1, (GDestroyNotify) g_free), NULL);
-#line 2165 "DataSource.c"
+#line 2166 "DataSource.c"
 }
 
 
@@ -2172,7 +2173,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 2175 "DataSource.c"
+#line 2176 "DataSource.c"
 }
 
 
@@ -2181,7 +2182,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 2184 "DataSource.c"
+#line 2185 "DataSource.c"
 }
 
 
@@ -2190,7 +2191,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 2193 "DataSource.c"
+#line 2194 "DataSource.c"
 }
 
 
@@ -2200,7 +2201,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 2203 "DataSource.c"
+#line 2204 "DataSource.c"
 }
 
 
@@ -2209,7 +2210,7 @@ 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 2212 "DataSource.c"
+#line 2213 "DataSource.c"
 }
 
 
@@ -2224,7 +2225,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 2227 "DataSource.c"
+#line 2228 "DataSource.c"
 }
 
 
@@ -2233,7 +2234,7 @@ 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 2236 "DataSource.c"
+#line 2237 "DataSource.c"
 }
 
 
@@ -2245,19 +2246,19 @@ static void data_source_real_destroy (DataSource* self) {
 	_vala_assert (_tmp0_, "marked_for_destroy");
 #line 344 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self->priv->is_destroyed = TRUE;
-#line 2248 "DataSource.c"
+#line 2249 "DataSource.c"
 	{
 		gint ctr = 0;
 #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		ctr = 0;
-#line 2253 "DataSource.c"
+#line 2254 "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 2260 "DataSource.c"
+#line 2261 "DataSource.c"
 				gint _tmp3_ = 0;
 				DataView** _tmp4_ = NULL;
 				gint _tmp4__length1 = 0;
@@ -2267,13 +2268,13 @@ static void data_source_real_destroy (DataSource* self) {
 				DataView* _tmp7_ = NULL;
 #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				if (!_tmp1_) {
-#line 2270 "DataSource.c"
+#line 2271 "DataSource.c"
 					gint _tmp2_ = 0;
 #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 2276 "DataSource.c"
+#line 2277 "DataSource.c"
 				}
 #line 347 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp1_ = FALSE;
@@ -2287,7 +2288,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 2290 "DataSource.c"
+#line 2291 "DataSource.c"
 				}
 #line 348 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp5_ = self->priv->subscribers;
@@ -2299,7 +2300,7 @@ 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 2302 "DataSource.c"
+#line 2303 "DataSource.c"
 					DataView* view = NULL;
 					DataView** _tmp8_ = NULL;
 					gint _tmp8__length1 = 0;
@@ -2341,14 +2342,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 2344 "DataSource.c"
+#line 2345 "DataSource.c"
 				}
 			}
 		}
 	}
 #line 357 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_signal_emit_by_name (self, "destroyed");
-#line 2351 "DataSource.c"
+#line 2352 "DataSource.c"
 }
 
 
@@ -2357,7 +2358,7 @@ 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 2360 "DataSource.c"
+#line 2361 "DataSource.c"
 }
 
 
@@ -2365,7 +2366,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 	gboolean result = FALSE;
 	gboolean ret = FALSE;
 	gboolean _tmp0_ = FALSE;
-	SourceCollection* _tmp10_ = NULL;
+	SourceCollection* _tmp11_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 366 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (self), FALSE);
@@ -2375,7 +2376,7 @@ 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 2378 "DataSource.c"
+#line 2379 "DataSource.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			gboolean _tmp2_ = FALSE;
@@ -2386,7 +2387,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 			_tmp1_ = _tmp2_;
 #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2389 "DataSource.c"
+#line 2390 "DataSource.c"
 				goto __catch50_g_error;
 			}
 #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2395,7 +2396,7 @@ 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 2398 "DataSource.c"
+#line 2399 "DataSource.c"
 				gchar* _tmp4_ = NULL;
 				gchar* _tmp5_ = NULL;
 #line 372 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2406,7 +2407,7 @@ 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 2409 "DataSource.c"
+#line 2410 "DataSource.c"
 			}
 		}
 		goto __finally50;
@@ -2437,18 +2438,20 @@ 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 2440 "DataSource.c"
+#line 2441 "DataSource.c"
 		}
 		__finally50:
 #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 2446 "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);
 #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			g_clear_error (&_inner_error_);
 #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-			return FALSE;
-#line 2451 "DataSource.c"
+			return _tmp10_;
+#line 2454 "DataSource.c"
 		}
 	}
 #line 380 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2456,22 +2459,22 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 #line 381 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	data_source_destroy (self);
 #line 383 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	_tmp10_ = self->priv->unlinked_from_collection;
+	_tmp11_ = self->priv->unlinked_from_collection;
 #line 383 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	if (_tmp10_ != NULL) {
-#line 2462 "DataSource.c"
-		SourceCollection* _tmp11_ = NULL;
+	if (_tmp11_ != NULL) {
+#line 2465 "DataSource.c"
+		SourceCollection* _tmp12_ = NULL;
 #line 384 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-		_tmp11_ = self->priv->unlinked_from_collection;
+		_tmp12_ = self->priv->unlinked_from_collection;
 #line 384 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-		source_collection_notify_unlinked_destroyed (_tmp11_, self);
-#line 2468 "DataSource.c"
+		source_collection_notify_unlinked_destroyed (_tmp12_, self);
+#line 2471 "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 2474 "DataSource.c"
+#line 2477 "DataSource.c"
 }
 
 
@@ -2482,13 +2485,13 @@ static void _vala_array_add63 (DataView*** array, int* length, int* size, DataVi
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		*array = g_renew (DataView*, *array, (*size) + 1);
-#line 2485 "DataSource.c"
+#line 2488 "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 2491 "DataSource.c"
+#line 2494 "DataSource.c"
 }
 
 
@@ -2506,19 +2509,19 @@ 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 2509 "DataSource.c"
+#line 2512 "DataSource.c"
 	{
 		gint ctr = 0;
 #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		ctr = 0;
-#line 2514 "DataSource.c"
+#line 2517 "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 2521 "DataSource.c"
+#line 2524 "DataSource.c"
 				gint _tmp3_ = 0;
 				DataView** _tmp4_ = NULL;
 				gint _tmp4__length1 = 0;
@@ -2528,13 +2531,13 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) {
 				DataView* _tmp7_ = NULL;
 #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				if (!_tmp1_) {
-#line 2531 "DataSource.c"
+#line 2534 "DataSource.c"
 					gint _tmp2_ = 0;
 #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 2537 "DataSource.c"
+#line 2540 "DataSource.c"
 				}
 #line 398 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp1_ = FALSE;
@@ -2548,7 +2551,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 2551 "DataSource.c"
+#line 2554 "DataSource.c"
 				}
 #line 399 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp5_ = self->priv->subscribers;
@@ -2560,7 +2563,7 @@ 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 2563 "DataSource.c"
+#line 2566 "DataSource.c"
 					DataView** _tmp8_ = NULL;
 					gint _tmp8__length1 = 0;
 					gint _tmp9_ = 0;
@@ -2585,7 +2588,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 2588 "DataSource.c"
+#line 2591 "DataSource.c"
 				}
 			}
 		}
@@ -2600,7 +2603,7 @@ 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 2603 "DataSource.c"
+#line 2606 "DataSource.c"
 }
 
 
@@ -2614,19 +2617,19 @@ 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 2617 "DataSource.c"
+#line 2620 "DataSource.c"
 	{
 		gint ctr = 0;
 #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		ctr = 0;
-#line 2622 "DataSource.c"
+#line 2625 "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 2629 "DataSource.c"
+#line 2632 "DataSource.c"
 				gint _tmp3_ = 0;
 				DataView** _tmp4_ = NULL;
 				gint _tmp4__length1 = 0;
@@ -2637,13 +2640,13 @@ void data_source_internal_unsubscribe (DataSource* self, DataView* view) {
 				DataView* _tmp8_ = NULL;
 #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				if (!_tmp1_) {
-#line 2640 "DataSource.c"
+#line 2643 "DataSource.c"
 					gint _tmp2_ = 0;
 #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 2646 "DataSource.c"
+#line 2649 "DataSource.c"
 				}
 #line 414 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp1_ = FALSE;
@@ -2657,7 +2660,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 2660 "DataSource.c"
+#line 2663 "DataSource.c"
 				}
 #line 415 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp5_ = self->priv->subscribers;
@@ -2671,7 +2674,7 @@ 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 2674 "DataSource.c"
+#line 2677 "DataSource.c"
 					DataView** _tmp9_ = NULL;
 					gint _tmp9__length1 = 0;
 					gint _tmp10_ = 0;
@@ -2690,7 +2693,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 2693 "DataSource.c"
+#line 2696 "DataSource.c"
 				}
 			}
 		}
@@ -2708,19 +2711,19 @@ 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 2711 "DataSource.c"
+#line 2714 "DataSource.c"
 	{
 		gint ctr = 0;
 #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		ctr = 0;
-#line 2716 "DataSource.c"
+#line 2719 "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 2723 "DataSource.c"
+#line 2726 "DataSource.c"
 				gint _tmp3_ = 0;
 				DataView** _tmp4_ = NULL;
 				gint _tmp4__length1 = 0;
@@ -2730,13 +2733,13 @@ void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscri
 				DataView* _tmp7_ = NULL;
 #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				if (!_tmp1_) {
-#line 2733 "DataSource.c"
+#line 2736 "DataSource.c"
 					gint _tmp2_ = 0;
 #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 2739 "DataSource.c"
+#line 2742 "DataSource.c"
 				}
 #line 427 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp1_ = FALSE;
@@ -2750,7 +2753,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 2753 "DataSource.c"
+#line 2756 "DataSource.c"
 				}
 #line 428 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp5_ = self->priv->subscribers;
@@ -2762,7 +2765,7 @@ 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 2765 "DataSource.c"
+#line 2768 "DataSource.c"
 					DataSourceContactSubscriber _tmp8_ = NULL;
 					void* _tmp8__target = NULL;
 					DataView** _tmp9_ = NULL;
@@ -2783,14 +2786,14 @@ 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 2786 "DataSource.c"
+#line 2789 "DataSource.c"
 				}
 			}
 		}
 	}
 #line 431 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self->priv->in_contact = FALSE;
-#line 2793 "DataSource.c"
+#line 2796 "DataSource.c"
 }
 
 
@@ -2806,19 +2809,19 @@ 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 2809 "DataSource.c"
+#line 2812 "DataSource.c"
 	{
 		gint ctr = 0;
 #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		ctr = 0;
-#line 2814 "DataSource.c"
+#line 2817 "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 2821 "DataSource.c"
+#line 2824 "DataSource.c"
 				gint _tmp3_ = 0;
 				DataView** _tmp4_ = NULL;
 				gint _tmp4__length1 = 0;
@@ -2828,13 +2831,13 @@ void data_source_contact_subscribers_alteration (DataSource* self, Alteration* a
 				DataView* _tmp7_ = NULL;
 #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				if (!_tmp1_) {
-#line 2831 "DataSource.c"
+#line 2834 "DataSource.c"
 					gint _tmp2_ = 0;
 #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 2837 "DataSource.c"
+#line 2840 "DataSource.c"
 				}
 #line 438 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp1_ = FALSE;
@@ -2848,7 +2851,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 2851 "DataSource.c"
+#line 2854 "DataSource.c"
 				}
 #line 439 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 				_tmp5_ = self->priv->subscribers;
@@ -2860,7 +2863,7 @@ 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 2863 "DataSource.c"
+#line 2866 "DataSource.c"
 					DataView** _tmp8_ = NULL;
 					gint _tmp8__length1 = 0;
 					gint _tmp9_ = 0;
@@ -2878,21 +2881,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 2881 "DataSource.c"
+#line 2884 "DataSource.c"
 				}
 			}
 		}
 	}
 #line 442 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	self->priv->in_contact = FALSE;
-#line 2888 "DataSource.c"
+#line 2891 "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 2895 "DataSource.c"
+#line 2898 "DataSource.c"
 }
 
 
@@ -2911,26 +2914,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 2914 "DataSource.c"
+#line 2917 "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 2920 "DataSource.c"
+#line 2923 "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 2926 "DataSource.c"
+#line 2929 "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 2933 "DataSource.c"
+#line 2936 "DataSource.c"
 }
 
 
@@ -2944,35 +2947,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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -2987,7 +2990,7 @@ static void data_source_class_init (DataSourceClass * klass) {
 	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 2990 "DataSource.c"
+#line 2993 "DataSource.c"
 }
 
 
@@ -3015,7 +3018,7 @@ 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 3018 "DataSource.c"
+#line 3021 "DataSource.c"
 }
 
 
@@ -3031,7 +3034,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 3034 "DataSource.c"
+#line 3037 "DataSource.c"
 }
 
 
@@ -3052,7 +3055,7 @@ static void source_snapshot_real_notify_broken (SourceSnapshot* self) {
 	self->priv->snapshot_broken = TRUE;
 #line 457 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_signal_emit_by_name (self, "broken");
-#line 3055 "DataSource.c"
+#line 3058 "DataSource.c"
 }
 
 
@@ -3061,7 +3064,7 @@ 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 3064 "DataSource.c"
+#line 3067 "DataSource.c"
 }
 
 
@@ -3076,7 +3079,7 @@ gboolean source_snapshot_is_broken (SourceSnapshot* self) {
 	result = _tmp0_;
 #line 461 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 3079 "DataSource.c"
+#line 3082 "DataSource.c"
 }
 
 
@@ -3086,7 +3089,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 3089 "DataSource.c"
+#line 3092 "DataSource.c"
 }
 
 
@@ -3097,7 +3100,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 3100 "DataSource.c"
+#line 3103 "DataSource.c"
 }
 
 
@@ -3106,7 +3109,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 3109 "DataSource.c"
+#line 3112 "DataSource.c"
 	}
 }
 
@@ -3116,11 +3119,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 3119 "DataSource.c"
+#line 3122 "DataSource.c"
 	} else {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3123 "DataSource.c"
+#line 3126 "DataSource.c"
 	}
 }
 
@@ -3128,37 +3131,37 @@ 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 3131 "DataSource.c"
+#line 3134 "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 3138 "DataSource.c"
+#line 3141 "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 3145 "DataSource.c"
+#line 3148 "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 3149 "DataSource.c"
+#line 3152 "DataSource.c"
 		}
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = source_snapshot_ref (object);
-#line 3153 "DataSource.c"
+#line 3156 "DataSource.c"
 	} else {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 3157 "DataSource.c"
+#line 3160 "DataSource.c"
 	}
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return NULL;
-#line 3161 "DataSource.c"
+#line 3164 "DataSource.c"
 }
 
 
@@ -3169,25 +3172,25 @@ static gchar* value_source_snapshot_lcopy_value (const GValue* value, guint n_co
 	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 3172 "DataSource.c"
+#line 3175 "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 3178 "DataSource.c"
+#line 3181 "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 3182 "DataSource.c"
+#line 3185 "DataSource.c"
 	} else {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		*object_p = source_snapshot_ref (value->data[0].v_pointer);
-#line 3186 "DataSource.c"
+#line 3189 "DataSource.c"
 	}
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return NULL;
-#line 3190 "DataSource.c"
+#line 3193 "DataSource.c"
 }
 
 
@@ -3201,7 +3204,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 3204 "DataSource.c"
+#line 3207 "DataSource.c"
 }
 
 
@@ -3210,7 +3213,7 @@ 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 3213 "DataSource.c"
+#line 3216 "DataSource.c"
 }
 
 
@@ -3230,17 +3233,17 @@ 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 3233 "DataSource.c"
+#line 3236 "DataSource.c"
 	} else {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 3237 "DataSource.c"
+#line 3240 "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 3243 "DataSource.c"
+#line 3246 "DataSource.c"
 	}
 }
 
@@ -3259,17 +3262,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 3262 "DataSource.c"
+#line 3265 "DataSource.c"
 	} else {
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 3266 "DataSource.c"
+#line 3269 "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 3272 "DataSource.c"
+#line 3275 "DataSource.c"
 	}
 }
 
@@ -3282,12 +3285,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 = 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 3290 "DataSource.c"
+#line 3293 "DataSource.c"
 }
 
 
@@ -3298,7 +3301,7 @@ 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 3301 "DataSource.c"
+#line 3304 "DataSource.c"
 }
 
 
@@ -3308,7 +3311,7 @@ static void source_snapshot_finalize (SourceSnapshot* obj) {
 	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 3311 "DataSource.c"
+#line 3314 "DataSource.c"
 }
 
 
@@ -3333,7 +3336,7 @@ gpointer source_snapshot_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 446 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return instance;
-#line 3336 "DataSource.c"
+#line 3339 "DataSource.c"
 }
 
 
@@ -3346,7 +3349,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 3349 "DataSource.c"
+#line 3352 "DataSource.c"
 	}
 }
 
@@ -3370,7 +3373,7 @@ static gchar* string_strip (const gchar* self) {
 	result = _result_;
 #line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 3373 "DataSource.c"
+#line 3376 "DataSource.c"
 }
 
 
@@ -3415,14 +3418,14 @@ 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 3418 "DataSource.c"
+#line 3421 "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 3425 "DataSource.c"
+#line 3428 "DataSource.c"
 }
 
 
@@ -3484,14 +3487,14 @@ 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 3487 "DataSource.c"
+#line 3490 "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 3494 "DataSource.c"
+#line 3497 "DataSource.c"
 }
 
 
@@ -3511,7 +3514,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 3514 "DataSource.c"
+#line 3517 "DataSource.c"
 }
 
 
@@ -3531,7 +3534,7 @@ 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 3534 "DataSource.c"
+#line 3537 "DataSource.c"
 		const gchar* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3540,15 +3543,15 @@ static gboolean source_backlink_validate_name_value (const gchar* name, const gc
 		_tmp5_ = string_contains (_tmp4_, "|");
 #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp1_ = !_tmp5_;
-#line 3543 "DataSource.c"
+#line 3546 "DataSource.c"
 	} else {
 #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp1_ = FALSE;
-#line 3547 "DataSource.c"
+#line 3550 "DataSource.c"
 	}
 #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp1_) {
-#line 3551 "DataSource.c"
+#line 3554 "DataSource.c"
 		const gchar* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
 #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3557,17 +3560,17 @@ static gboolean source_backlink_validate_name_value (const gchar* name, const gc
 		_tmp7_ = string_contains (_tmp6_, "|");
 #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp0_ = !_tmp7_;
-#line 3560 "DataSource.c"
+#line 3563 "DataSource.c"
 	} else {
 #line 513 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp0_ = FALSE;
-#line 3564 "DataSource.c"
+#line 3567 "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 3570 "DataSource.c"
+#line 3573 "DataSource.c"
 }
 
 
@@ -3594,7 +3597,7 @@ gchar* source_backlink_to_string (SourceBacklink* self) {
 	result = _tmp4_;
 #line 517 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 3597 "DataSource.c"
+#line 3600 "DataSource.c"
 }
 
 
@@ -3630,7 +3633,7 @@ guint source_backlink_hash_func (SourceBacklink* backlink) {
 	result = _tmp3_ ^ _tmp7_;
 #line 521 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 3633 "DataSource.c"
+#line 3636 "DataSource.c"
 }
 
 
@@ -3661,7 +3664,7 @@ 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 3664 "DataSource.c"
+#line 3667 "DataSource.c"
 		GEqualFunc _tmp7_ = NULL;
 		SourceBacklink* _tmp8_ = NULL;
 		const gchar* _tmp9_ = NULL;
@@ -3682,17 +3685,17 @@ 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 3685 "DataSource.c"
+#line 3688 "DataSource.c"
 	} else {
 #line 525 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_tmp0_ = FALSE;
-#line 3689 "DataSource.c"
+#line 3692 "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 3695 "DataSource.c"
+#line 3698 "DataSource.c"
 }
 
 
@@ -3707,7 +3710,7 @@ const gchar* source_backlink_get_name (SourceBacklink* self) {
 	result = _tmp0_;
 #line 474 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 3710 "DataSource.c"
+#line 3713 "DataSource.c"
 }
 
 
@@ -3722,7 +3725,7 @@ const gchar* source_backlink_get_value (SourceBacklink* self) {
 	result = _tmp0_;
 #line 480 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 3725 "DataSource.c"
+#line 3728 "DataSource.c"
 }
 
 
@@ -3737,7 +3740,7 @@ const gchar* source_backlink_get_typename (SourceBacklink* self) {
 	result = _tmp0_;
 #line 487 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 3740 "DataSource.c"
+#line 3743 "DataSource.c"
 }
 
 
@@ -3755,7 +3758,7 @@ static gint64 int64_parse (const gchar* str) {
 	result = _tmp1_;
 #line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 3758 "DataSource.c"
+#line 3761 "DataSource.c"
 }
 
 
@@ -3773,14 +3776,14 @@ gint64 source_backlink_get_instance_id (SourceBacklink* self) {
 	result = _tmp1_;
 #line 494 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return result;
-#line 3776 "DataSource.c"
+#line 3779 "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 3783 "DataSource.c"
+#line 3786 "DataSource.c"
 }
 
 
@@ -3789,7 +3792,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 3792 "DataSource.c"
+#line 3795 "DataSource.c"
 	}
 }
 
@@ -3799,11 +3802,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 3802 "DataSource.c"
+#line 3805 "DataSource.c"
 	} else {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3806 "DataSource.c"
+#line 3809 "DataSource.c"
 	}
 }
 
@@ -3811,37 +3814,37 @@ 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 3814 "DataSource.c"
+#line 3817 "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 3821 "DataSource.c"
+#line 3824 "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 3828 "DataSource.c"
+#line 3831 "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 3832 "DataSource.c"
+#line 3835 "DataSource.c"
 		}
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = source_backlink_ref (object);
-#line 3836 "DataSource.c"
+#line 3839 "DataSource.c"
 	} else {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 3840 "DataSource.c"
+#line 3843 "DataSource.c"
 	}
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return NULL;
-#line 3844 "DataSource.c"
+#line 3847 "DataSource.c"
 }
 
 
@@ -3852,25 +3855,25 @@ static gchar* value_source_backlink_lcopy_value (const GValue* value, guint n_co
 	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 3855 "DataSource.c"
+#line 3858 "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 3861 "DataSource.c"
+#line 3864 "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 3865 "DataSource.c"
+#line 3868 "DataSource.c"
 	} else {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		*object_p = source_backlink_ref (value->data[0].v_pointer);
-#line 3869 "DataSource.c"
+#line 3872 "DataSource.c"
 	}
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return NULL;
-#line 3873 "DataSource.c"
+#line 3876 "DataSource.c"
 }
 
 
@@ -3884,7 +3887,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 3887 "DataSource.c"
+#line 3890 "DataSource.c"
 }
 
 
@@ -3893,7 +3896,7 @@ 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 3896 "DataSource.c"
+#line 3899 "DataSource.c"
 }
 
 
@@ -3913,17 +3916,17 @@ 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 3916 "DataSource.c"
+#line 3919 "DataSource.c"
 	} else {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 3920 "DataSource.c"
+#line 3923 "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 3926 "DataSource.c"
+#line 3929 "DataSource.c"
 	}
 }
 
@@ -3942,17 +3945,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 3945 "DataSource.c"
+#line 3948 "DataSource.c"
 	} else {
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 3949 "DataSource.c"
+#line 3952 "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 3955 "DataSource.c"
+#line 3958 "DataSource.c"
 	}
 }
 
@@ -3964,7 +3967,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 3967 "DataSource.c"
+#line 3970 "DataSource.c"
 }
 
 
@@ -3973,7 +3976,7 @@ 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 3976 "DataSource.c"
+#line 3979 "DataSource.c"
 }
 
 
@@ -3987,7 +3990,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 3990 "DataSource.c"
+#line 3993 "DataSource.c"
 }
 
 
@@ -4012,7 +4015,7 @@ gpointer source_backlink_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 468 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return instance;
-#line 4015 "DataSource.c"
+#line 4018 "DataSource.c"
 }
 
 
@@ -4025,7 +4028,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 4028 "DataSource.c"
+#line 4031 "DataSource.c"
 	}
 }
 
@@ -4033,14 +4036,14 @@ 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 4036 "DataSource.c"
+#line 4039 "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 4043 "DataSource.c"
+#line 4046 "DataSource.c"
 }
 
 
@@ -4115,7 +4118,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 4118 "DataSource.c"
+#line 4121 "DataSource.c"
 }
 
 
@@ -4124,7 +4127,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 4127 "DataSource.c"
+#line 4130 "DataSource.c"
 }
 
 
@@ -4133,7 +4136,7 @@ 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 4136 "DataSource.c"
+#line 4139 "DataSource.c"
 }
 
 
@@ -4145,7 +4148,7 @@ static void source_proxy_real_notify_reconstituted (SourceProxy* self, DataSourc
 	_tmp0_ = source;
 #line 594 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	g_signal_emit_by_name (self, "reconstituted", _tmp0_);
-#line 4148 "DataSource.c"
+#line 4151 "DataSource.c"
 }
 
 
@@ -4154,14 +4157,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 4157 "DataSource.c"
+#line 4160 "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 4164 "DataSource.c"
+#line 4167 "DataSource.c"
 }
 
 
@@ -4170,14 +4173,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 4173 "DataSource.c"
+#line 4176 "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 4180 "DataSource.c"
+#line 4183 "DataSource.c"
 }
 
 
@@ -4186,7 +4189,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 4189 "DataSource.c"
+#line 4192 "DataSource.c"
 }
 
 
@@ -4197,14 +4200,14 @@ 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 4200 "DataSource.c"
+#line 4203 "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 4207 "DataSource.c"
+#line 4210 "DataSource.c"
 }
 
 
@@ -4230,7 +4233,7 @@ 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 4233 "DataSource.c"
+#line 4236 "DataSource.c"
 }
 
 
@@ -4246,7 +4249,7 @@ static void source_proxy_drop_source (SourceProxy* self) {
 	if (_tmp0_ == NULL) {
 #line 620 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		return;
-#line 4249 "DataSource.c"
+#line 4252 "DataSource.c"
 	}
 #line 622 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp1_ = self->priv->source;
@@ -4258,7 +4261,7 @@ 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 4261 "DataSource.c"
+#line 4264 "DataSource.c"
 }
 
 
@@ -4296,13 +4299,13 @@ DataSource* source_proxy_get_source (SourceProxy* self) {
 		result = NULL;
 #line 628 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		return result;
-#line 4299 "DataSource.c"
+#line 4302 "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 4305 "DataSource.c"
+#line 4308 "DataSource.c"
 		DataSource* _tmp3_ = NULL;
 		DataSource* _tmp4_ = NULL;
 #line 631 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -4313,7 +4316,7 @@ DataSource* source_proxy_get_source (SourceProxy* self) {
 		result = _tmp4_;
 #line 631 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		return result;
-#line 4316 "DataSource.c"
+#line 4319 "DataSource.c"
 	}
 #line 636 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp5_ = self->priv->object_id;
@@ -4329,7 +4332,7 @@ DataSource* source_proxy_get_source (SourceProxy* self) {
 	_tmp9_ = new_source;
 #line 637 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if (_tmp8_ != _tmp9_) {
-#line 4332 "DataSource.c"
+#line 4335 "DataSource.c"
 		DataSource* _tmp10_ = NULL;
 		DataSource* _tmp11_ = NULL;
 #line 638 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -4340,7 +4343,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 4343 "DataSource.c"
+#line 4346 "DataSource.c"
 	}
 #line 639 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp12_ = self->priv->object_id;
@@ -4350,7 +4353,7 @@ 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 4353 "DataSource.c"
+#line 4356 "DataSource.c"
 		DataSource* _tmp15_ = NULL;
 		gint64 _tmp16_ = 0LL;
 #line 640 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -4359,7 +4362,7 @@ DataSource* source_proxy_get_source (SourceProxy* self) {
 		_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 4362 "DataSource.c"
+#line 4365 "DataSource.c"
 	}
 #line 641 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp17_ = self->priv->source;
@@ -4387,7 +4390,7 @@ 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 4390 "DataSource.c"
+#line 4393 "DataSource.c"
 }
 
 
@@ -4403,7 +4406,7 @@ 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 4406 "DataSource.c"
+#line 4409 "DataSource.c"
 }
 
 
@@ -4419,7 +4422,7 @@ 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 4422 "DataSource.c"
+#line 4425 "DataSource.c"
 	}
 	{
 		GeeIterator* _object_it = NULL;
@@ -4433,7 +4436,7 @@ 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 4436 "DataSource.c"
+#line 4439 "DataSource.c"
 			GeeIterator* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
 			DataObject* object = NULL;
@@ -4452,7 +4455,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 4455 "DataSource.c"
+#line 4458 "DataSource.c"
 			}
 #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp5_ = _object_it;
@@ -4472,7 +4475,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 4475 "DataSource.c"
+#line 4478 "DataSource.c"
 			}
 #line 667 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			_tmp10_ = object;
@@ -4486,11 +4489,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 4489 "DataSource.c"
+#line 4492 "DataSource.c"
 		}
 #line 661 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		_g_object_unref0 (_object_it);
-#line 4493 "DataSource.c"
+#line 4496 "DataSource.c"
 	}
 }
 
@@ -4498,7 +4501,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 4501 "DataSource.c"
+#line 4504 "DataSource.c"
 }
 
 
@@ -4513,7 +4516,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 4516 "DataSource.c"
+#line 4519 "DataSource.c"
 }
 
 
@@ -4522,7 +4525,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 4525 "DataSource.c"
+#line 4528 "DataSource.c"
 	}
 }
 
@@ -4532,11 +4535,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 4535 "DataSource.c"
+#line 4538 "DataSource.c"
 	} else {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4539 "DataSource.c"
+#line 4542 "DataSource.c"
 	}
 }
 
@@ -4544,37 +4547,37 @@ 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 4547 "DataSource.c"
+#line 4550 "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 4554 "DataSource.c"
+#line 4557 "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 4561 "DataSource.c"
+#line 4564 "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 4565 "DataSource.c"
+#line 4568 "DataSource.c"
 		}
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = source_proxy_ref (object);
-#line 4569 "DataSource.c"
+#line 4572 "DataSource.c"
 	} else {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 4573 "DataSource.c"
+#line 4576 "DataSource.c"
 	}
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return NULL;
-#line 4577 "DataSource.c"
+#line 4580 "DataSource.c"
 }
 
 
@@ -4585,25 +4588,25 @@ static gchar* value_source_proxy_lcopy_value (const GValue* value, guint n_colle
 	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 4588 "DataSource.c"
+#line 4591 "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 4594 "DataSource.c"
+#line 4597 "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 4598 "DataSource.c"
+#line 4601 "DataSource.c"
 	} else {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		*object_p = source_proxy_ref (value->data[0].v_pointer);
-#line 4602 "DataSource.c"
+#line 4605 "DataSource.c"
 	}
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return NULL;
-#line 4606 "DataSource.c"
+#line 4609 "DataSource.c"
 }
 
 
@@ -4617,7 +4620,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 4620 "DataSource.c"
+#line 4623 "DataSource.c"
 }
 
 
@@ -4626,7 +4629,7 @@ 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 4629 "DataSource.c"
+#line 4632 "DataSource.c"
 }
 
 
@@ -4646,17 +4649,17 @@ 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 4649 "DataSource.c"
+#line 4652 "DataSource.c"
 	} else {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 4653 "DataSource.c"
+#line 4656 "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 4659 "DataSource.c"
+#line 4662 "DataSource.c"
 	}
 }
 
@@ -4675,17 +4678,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 4678 "DataSource.c"
+#line 4681 "DataSource.c"
 	} else {
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 4682 "DataSource.c"
+#line 4685 "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 4688 "DataSource.c"
+#line 4691 "DataSource.c"
 	}
 }
 
@@ -4698,13 +4701,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 = 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 = 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 = 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 = 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"
@@ -4717,7 +4720,7 @@ static void source_proxy_class_init (SourceProxyClass * klass) {
 	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 4720 "DataSource.c"
+#line 4723 "DataSource.c"
 }
 
 
@@ -4726,7 +4729,7 @@ 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 4729 "DataSource.c"
+#line 4732 "DataSource.c"
 }
 
 
@@ -4754,7 +4757,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 4757 "DataSource.c"
+#line 4760 "DataSource.c"
 }
 
 
@@ -4779,7 +4782,7 @@ gpointer source_proxy_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 549 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	return instance;
-#line 4782 "DataSource.c"
+#line 4785 "DataSource.c"
 }
 
 
@@ -4792,7 +4795,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 4795 "DataSource.c"
+#line 4798 "DataSource.c"
 	}
 }
 
@@ -4802,7 +4805,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 4805 "DataSource.c"
+#line 4808 "DataSource.c"
 }
 
 
@@ -4813,7 +4816,7 @@ static void proxyable_base_init (ProxyableIface * iface) {
 	if (!initialized) {
 #line 676 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		initialized = TRUE;
-#line 4816 "DataSource.c"
+#line 4819 "DataSource.c"
 	}
 }
 
diff --git a/src/core/DataSourceTypes.c b/src/core/DataSourceTypes.c
index ea7d98a..a71a3c3 100644
--- a/src/core/DataSourceTypes.c
+++ b/src/core/DataSourceTypes.c
@@ -1,4 +1,4 @@
-/* DataSourceTypes.c generated by valac 0.34.4, the Vala compiler
+/* DataSourceTypes.c generated by valac 0.34.7, the Vala compiler
  * generated from DataSourceTypes.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -727,15 +727,15 @@ 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 = 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 = 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 = 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 = 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 = 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"
@@ -813,9 +813,9 @@ 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 = 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 = photo_source_real_get_pixbuf;
+	((PhotoSourceClass *) klass)->get_pixbuf = (GdkPixbuf* (*)(PhotoSource*, Scaling*, GError**)) photo_source_real_get_pixbuf;
 #line 820 "DataSourceTypes.c"
 }
 
@@ -883,11 +883,12 @@ EventSource* event_source_construct (GType object_type, gint64 object_id) {
 
 
 static time_t event_source_real_get_start_time (EventSource* self) {
+	time_t _tmp0_ = 0;
 #line 75 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	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 0;
-#line 891 "DataSourceTypes.c"
+	return _tmp0_;
+#line 892 "DataSourceTypes.c"
 }
 
 
@@ -896,16 +897,17 @@ 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 900 "DataSourceTypes.c"
+#line 901 "DataSourceTypes.c"
 }
 
 
 static time_t event_source_real_get_end_time (EventSource* self) {
+	time_t _tmp0_ = 0;
 #line 77 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	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 0;
-#line 909 "DataSourceTypes.c"
+	return _tmp0_;
+#line 911 "DataSourceTypes.c"
 }
 
 
@@ -914,16 +916,17 @@ 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 918 "DataSourceTypes.c"
+#line 920 "DataSourceTypes.c"
 }
 
 
 static guint64 event_source_real_get_total_filesize (EventSource* self) {
+	guint64 _tmp0_ = 0ULL;
 #line 79 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	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 0ULL;
-#line 927 "DataSourceTypes.c"
+	return _tmp0_;
+#line 930 "DataSourceTypes.c"
 }
 
 
@@ -932,16 +935,17 @@ 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 936 "DataSourceTypes.c"
+#line 939 "DataSourceTypes.c"
 }
 
 
 static gint event_source_real_get_media_count (EventSource* self) {
+	gint _tmp0_ = 0;
 #line 81 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	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 0;
-#line 945 "DataSourceTypes.c"
+	return _tmp0_;
+#line 949 "DataSourceTypes.c"
 }
 
 
@@ -950,7 +954,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 954 "DataSourceTypes.c"
+#line 958 "DataSourceTypes.c"
 }
 
 
@@ -959,7 +963,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 963 "DataSourceTypes.c"
+#line 967 "DataSourceTypes.c"
 }
 
 
@@ -968,7 +972,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 972 "DataSourceTypes.c"
+#line 976 "DataSourceTypes.c"
 }
 
 
@@ -977,7 +981,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 981 "DataSourceTypes.c"
+#line 985 "DataSourceTypes.c"
 }
 
 
@@ -986,16 +990,17 @@ 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 990 "DataSourceTypes.c"
+#line 994 "DataSourceTypes.c"
 }
 
 
 static gboolean event_source_real_set_comment (EventSource* self, const gchar* comment) {
+	gboolean _tmp0_ = FALSE;
 #line 87 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 	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 FALSE;
-#line 999 "DataSourceTypes.c"
+	return _tmp0_;
+#line 1004 "DataSourceTypes.c"
 }
 
 
@@ -1004,7 +1009,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 1008 "DataSourceTypes.c"
+#line 1013 "DataSourceTypes.c"
 }
 
 
@@ -1012,20 +1017,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 = 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 = 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 = 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 = 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 = 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 = 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 = event_source_real_set_comment;
-#line 1029 "DataSourceTypes.c"
+	((EventSourceClass *) klass)->set_comment = (gboolean (*)(EventSource*, const gchar*)) event_source_real_set_comment;
+#line 1034 "DataSourceTypes.c"
 }
 
 
@@ -1050,7 +1055,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 1054 "DataSourceTypes.c"
+#line 1059 "DataSourceTypes.c"
 }
 
 
@@ -1059,7 +1064,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 1063 "DataSourceTypes.c"
+#line 1068 "DataSourceTypes.c"
 }
 
 
@@ -1068,7 +1073,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 1072 "DataSourceTypes.c"
+#line 1077 "DataSourceTypes.c"
 }
 
 
@@ -1077,7 +1082,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 1081 "DataSourceTypes.c"
+#line 1086 "DataSourceTypes.c"
 }
 
 
@@ -1086,7 +1091,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 1090 "DataSourceTypes.c"
+#line 1095 "DataSourceTypes.c"
 }
 
 
@@ -1095,7 +1100,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 1099 "DataSourceTypes.c"
+#line 1104 "DataSourceTypes.c"
 }
 
 
@@ -1106,7 +1111,7 @@ static void container_source_base_init (ContainerSourceIface * iface) {
 	if (!initialized) {
 #line 94 "/home/jens/Source/shotwell/src/core/DataSourceTypes.vala"
 		initialized = TRUE;
-#line 1110 "DataSourceTypes.c"
+#line 1115 "DataSourceTypes.c"
 	}
 }
 
diff --git a/src/core/DataView.c b/src/core/DataView.c
index 2e70156..b25fa1e 100644
--- a/src/core/DataView.c
+++ b/src/core/DataView.c
@@ -1,4 +1,4 @@
-/* DataView.c generated by valac 0.34.4, the Vala compiler
+/* DataView.c generated by valac 0.34.7, the Vala compiler
  * generated from DataView.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -603,15 +603,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 = 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 = 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 = 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 = 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 = 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"
diff --git a/src/core/DataViewTypes.c b/src/core/DataViewTypes.c
index 355700d..806bca2 100644
--- a/src/core/DataViewTypes.c
+++ b/src/core/DataViewTypes.c
@@ -1,4 +1,4 @@
-/* DataViewTypes.c generated by valac 0.34.4, the Vala compiler
+/* DataViewTypes.c generated by valac 0.34.7, the Vala compiler
  * generated from DataViewTypes.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -338,7 +338,7 @@ 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 = 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"
diff --git a/src/core/DatabaseSourceCollection.c b/src/core/DatabaseSourceCollection.c
index 0de87db..d21ab1b 100644
--- a/src/core/DatabaseSourceCollection.c
+++ b/src/core/DatabaseSourceCollection.c
@@ -1,4 +1,4 @@
-/* DatabaseSourceCollection.c generated by valac 0.34.4, the Vala compiler
+/* DatabaseSourceCollection.c generated by valac 0.34.7, the Vala compiler
  * generated from DatabaseSourceCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -605,9 +605,9 @@ 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 = 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 = 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"
 }
 
@@ -617,7 +617,7 @@ static void database_source_collection_instance_init (DatabaseSourceCollection *
 #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"
-	_tmp0_ = gee_hash_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _int64_hash_gee_hash_data_func, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _int64_hash_gee_hash_data_func, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 17 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	self->priv->map = _tmp0_;
 #line 624 "DatabaseSourceCollection.c"
@@ -870,7 +870,7 @@ 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 = 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"
 }
 
@@ -880,7 +880,7 @@ static void database_source_holding_tank_instance_init (DatabaseSourceHoldingTan
 #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"
-	_tmp0_ = gee_hash_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _int64_hash_gee_hash_data_func, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _int64_hash_gee_hash_data_func, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
 #line 57 "/home/jens/Source/shotwell/src/core/DatabaseSourceCollection.vala"
 	self->priv->map = _tmp0_;
 #line 887 "DatabaseSourceCollection.c"
diff --git a/src/core/SourceCollection.c b/src/core/SourceCollection.c
index edda651..96c0bfd 100644
--- a/src/core/SourceCollection.c
+++ b/src/core/SourceCollection.c
@@ -1,4 +1,4 @@
-/* SourceCollection.c generated by valac 0.34.4, the Vala compiler
+/* SourceCollection.c generated by valac 0.34.7, the Vala compiler
  * generated from SourceCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -341,11 +341,12 @@ SourceCollection* source_collection_construct (GType object_type, const gchar* n
 
 
 static gboolean source_collection_real_holds_type_of_source (SourceCollection* self, DataSource* source) {
+	gboolean _tmp0_ = FALSE;
 #line 54 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	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 FALSE;
-#line 349 "SourceCollection.c"
+	return _tmp0_;
+#line 350 "SourceCollection.c"
 }
 
 
@@ -354,7 +355,7 @@ 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 358 "SourceCollection.c"
+#line 359 "SourceCollection.c"
 }
 
 
@@ -366,7 +367,7 @@ static void source_collection_real_notify_items_unlinking (SourceCollection* sel
 	_tmp0_ = unlinking;
 #line 57 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_signal_emit_by_name (self, "items-unlinking", _tmp0_);
-#line 370 "SourceCollection.c"
+#line 371 "SourceCollection.c"
 }
 
 
@@ -375,7 +376,7 @@ 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 379 "SourceCollection.c"
+#line 380 "SourceCollection.c"
 }
 
 
@@ -387,7 +388,7 @@ static void source_collection_real_notify_items_relinked (SourceCollection* self
 	_tmp0_ = relinked;
 #line 61 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_signal_emit_by_name (self, "items-relinked", _tmp0_);
-#line 391 "SourceCollection.c"
+#line 392 "SourceCollection.c"
 }
 
 
@@ -396,7 +397,7 @@ 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 400 "SourceCollection.c"
+#line 401 "SourceCollection.c"
 }
 
 
@@ -408,7 +409,7 @@ static void source_collection_real_notify_item_destroyed (SourceCollection* self
 	_tmp0_ = source;
 #line 65 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_signal_emit_by_name (self, "item-destroyed", _tmp0_);
-#line 412 "SourceCollection.c"
+#line 413 "SourceCollection.c"
 }
 
 
@@ -417,7 +418,7 @@ 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 421 "SourceCollection.c"
+#line 422 "SourceCollection.c"
 }
 
 
@@ -429,7 +430,7 @@ static void source_collection_real_notify_items_destroyed (SourceCollection* sel
 	_tmp0_ = destroyed;
 #line 69 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_signal_emit_by_name (self, "items-destroyed", _tmp0_);
-#line 433 "SourceCollection.c"
+#line 434 "SourceCollection.c"
 }
 
 
@@ -438,7 +439,7 @@ 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 442 "SourceCollection.c"
+#line 443 "SourceCollection.c"
 }
 
 
@@ -450,7 +451,7 @@ static void source_collection_real_notify_unlinked_destroyed (SourceCollection*
 	_tmp0_ = unlinked;
 #line 74 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_signal_emit_by_name (self, "unlinked-destroyed", _tmp0_);
-#line 454 "SourceCollection.c"
+#line 455 "SourceCollection.c"
 }
 
 
@@ -459,7 +460,7 @@ 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 463 "SourceCollection.c"
+#line 464 "SourceCollection.c"
 }
 
 
@@ -476,7 +477,7 @@ static void source_collection_real_notify_backlink_removed (SourceCollection* se
 	_tmp1_ = sources;
 #line 79 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_signal_emit_by_name (self, "backlink-removed", _tmp0_, _tmp1_);
-#line 480 "SourceCollection.c"
+#line 481 "SourceCollection.c"
 }
 
 
@@ -485,7 +486,7 @@ 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 489 "SourceCollection.c"
+#line 490 "SourceCollection.c"
 }
 
 
@@ -503,7 +504,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 507 "SourceCollection.c"
+#line 508 "SourceCollection.c"
 }
 
 
@@ -512,7 +513,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 516 "SourceCollection.c"
+#line 517 "SourceCollection.c"
 }
 
 
@@ -521,14 +522,14 @@ 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 525 "SourceCollection.c"
+#line 526 "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 532 "SourceCollection.c"
+#line 533 "SourceCollection.c"
 }
 
 
@@ -571,7 +572,7 @@ 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 575 "SourceCollection.c"
+#line 576 "SourceCollection.c"
 		Marker* _tmp5_ = NULL;
 		ProgressMonitor _tmp6_ = NULL;
 		void* _tmp6__target = NULL;
@@ -586,7 +587,7 @@ 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 590 "SourceCollection.c"
+#line 591 "SourceCollection.c"
 	} else {
 		Marker* _tmp8_ = NULL;
 		ProgressMonitor _tmp9_ = NULL;
@@ -602,7 +603,7 @@ 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 606 "SourceCollection.c"
+#line 607 "SourceCollection.c"
 	}
 	{
 		GeeArrayList* _source_list = NULL;
@@ -625,7 +626,7 @@ gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, g
 #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp14_ = _source_list;
 #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-		_tmp15_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp15_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp16_ = _tmp15_;
 #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -634,7 +635,7 @@ 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 638 "SourceCollection.c"
+#line 639 "SourceCollection.c"
 			gint _tmp17_ = 0;
 			gint _tmp18_ = 0;
 			gint _tmp19_ = 0;
@@ -655,7 +656,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 659 "SourceCollection.c"
+#line 660 "SourceCollection.c"
 			}
 #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 			_tmp20_ = _source_list;
@@ -671,11 +672,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 675 "SourceCollection.c"
+#line 676 "SourceCollection.c"
 		}
 #line 98 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_g_object_unref0 (_source_list);
-#line 679 "SourceCollection.c"
+#line 680 "SourceCollection.c"
 	}
 #line 100 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp24_ = counter;
@@ -693,7 +694,7 @@ 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 697 "SourceCollection.c"
+#line 698 "SourceCollection.c"
 		GeeList* _tmp29_ = NULL;
 		SourceCollectionDestroyCounter* _tmp30_ = NULL;
 		GeeArrayList* _tmp31_ = NULL;
@@ -705,14 +706,14 @@ 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 709 "SourceCollection.c"
+#line 710 "SourceCollection.c"
 	}
 #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp32_ = counter;
 #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp33_ = _tmp32_->not_removed;
 #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	_tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp35_ = _tmp34_;
 #line 109 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -721,19 +722,19 @@ 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 725 "SourceCollection.c"
+#line 726 "SourceCollection.c"
 }
 
 
 static gboolean source_collection_destroy_and_delete_source (SourceCollection* self, DataObject* object, GObject* user) {
 	gboolean result = FALSE;
 	gboolean success = FALSE;
-	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-	gboolean _tmp9_ = FALSE;
-	DataObject* _tmp10_ = NULL;
-	GObject* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	gboolean _tmp5_ = FALSE;
+	gboolean _tmp10_ = FALSE;
+	DataObject* _tmp11_ = NULL;
+	GObject* _tmp12_ = NULL;
+	gboolean _tmp13_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 112 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_val_if_fail (IS_SOURCE_COLLECTION (self), FALSE);
@@ -743,7 +744,7 @@ 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 747 "SourceCollection.c"
+#line 748 "SourceCollection.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		DataObject* _tmp1_ = NULL;
@@ -756,12 +757,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 760 "SourceCollection.c"
+#line 761 "SourceCollection.c"
 			goto __catch49_g_error;
 		}
 #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		success = _tmp0_;
-#line 765 "SourceCollection.c"
+#line 766 "SourceCollection.c"
 	}
 	goto __finally49;
 	__catch49_g_error:
@@ -775,76 +776,78 @@ 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 779 "SourceCollection.c"
+#line 780 "SourceCollection.c"
 	}
 	__finally49:
 #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 785 "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);
 #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		g_clear_error (&_inner_error_);
 #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-		return FALSE;
-#line 790 "SourceCollection.c"
+		return _tmp3_;
+#line 793 "SourceCollection.c"
 	}
 #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	_tmp4_ = success;
+	_tmp5_ = success;
 #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	if (!_tmp4_) {
-#line 796 "SourceCollection.c"
-		DataObject* _tmp5_ = NULL;
+	if (!_tmp5_) {
+#line 799 "SourceCollection.c"
+		DataObject* _tmp6_ = NULL;
 #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-		_tmp5_ = object;
+		_tmp6_ = object;
 #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-		_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_MEDIA_SOURCE);
-#line 802 "SourceCollection.c"
+		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_MEDIA_SOURCE);
+#line 805 "SourceCollection.c"
 	} else {
 #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-		_tmp3_ = FALSE;
-#line 806 "SourceCollection.c"
+		_tmp4_ = FALSE;
+#line 809 "SourceCollection.c"
 	}
 #line 120 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	if (_tmp3_) {
-#line 810 "SourceCollection.c"
-		GObject* _tmp6_ = NULL;
-		GeeArrayList* _tmp7_ = NULL;
-		DataObject* _tmp8_ = NULL;
+	if (_tmp4_) {
+#line 813 "SourceCollection.c"
+		GObject* _tmp7_ = NULL;
+		GeeArrayList* _tmp8_ = NULL;
+		DataObject* _tmp9_ = NULL;
 #line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-		_tmp6_ = user;
+		_tmp7_ = user;
 #line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->not_removed;
+		_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SOURCE_COLLECTION_TYPE_DESTROY_COUNTER, SourceCollectionDestroyCounter)->not_removed;
 #line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-		_tmp8_ = object;
+		_tmp9_ = object;
 #line 121 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 822 "SourceCollection.c"
+		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 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	_tmp10_ = object;
+	_tmp11_ = object;
 #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	_tmp11_ = user;
+	_tmp12_ = user;
 #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	_tmp12_ = source_collection_destroy_source (self, _tmp10_, _tmp11_);
+	_tmp13_ = source_collection_destroy_source (self, _tmp11_, _tmp12_);
 #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	if (_tmp12_) {
-#line 832 "SourceCollection.c"
-		gboolean _tmp13_ = FALSE;
+	if (_tmp13_) {
+#line 835 "SourceCollection.c"
+		gboolean _tmp14_ = FALSE;
 #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-		_tmp13_ = success;
+		_tmp14_ = success;
 #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-		_tmp9_ = _tmp13_;
-#line 838 "SourceCollection.c"
+		_tmp10_ = _tmp14_;
+#line 841 "SourceCollection.c"
 	} else {
 #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-		_tmp9_ = FALSE;
-#line 842 "SourceCollection.c"
+		_tmp10_ = FALSE;
+#line 845 "SourceCollection.c"
 	}
 #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	result = _tmp9_;
+	result = _tmp10_;
 #line 124 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	return result;
-#line 848 "SourceCollection.c"
+#line 851 "SourceCollection.c"
 }
 
 
@@ -891,7 +894,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 895 "SourceCollection.c"
+#line 898 "SourceCollection.c"
 }
 
 
@@ -900,7 +903,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 904 "SourceCollection.c"
+#line 907 "SourceCollection.c"
 }
 
 
@@ -909,7 +912,7 @@ 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 913 "SourceCollection.c"
+#line 916 "SourceCollection.c"
 }
 
 
@@ -928,15 +931,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 932 "SourceCollection.c"
+#line 935 "SourceCollection.c"
 		GeeHashMultiMap* _tmp1_ = NULL;
 #line 142 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-		_tmp1_ = gee_hash_multi_map_new (TYPE_SOURCE_BACKLINK, (GBoxedCopyFunc) source_backlink_ref, source_backlink_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, 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);
+		_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 940 "SourceCollection.c"
+#line 943 "SourceCollection.c"
 	}
 #line 146 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp2_ = self->priv->backlinks;
@@ -946,7 +949,7 @@ 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 950 "SourceCollection.c"
+#line 953 "SourceCollection.c"
 }
 
 
@@ -979,7 +982,7 @@ 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 983 "SourceCollection.c"
+#line 986 "SourceCollection.c"
 }
 
 
@@ -993,7 +996,7 @@ static gboolean source_collection_real_has_backlink (SourceCollection* self, Sou
 	_tmp1_ = self->priv->backlinks;
 #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	if (_tmp1_ != NULL) {
-#line 997 "SourceCollection.c"
+#line 1000 "SourceCollection.c"
 		GeeMultiMap* _tmp2_ = NULL;
 		SourceBacklink* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
@@ -1005,17 +1008,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 1009 "SourceCollection.c"
+#line 1012 "SourceCollection.c"
 	} else {
 #line 158 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp0_ = FALSE;
-#line 1013 "SourceCollection.c"
+#line 1016 "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 1019 "SourceCollection.c"
+#line 1022 "SourceCollection.c"
 }
 
 
@@ -1024,7 +1027,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 1028 "SourceCollection.c"
+#line 1031 "SourceCollection.c"
 }
 
 
@@ -1033,7 +1036,7 @@ 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 1037 "SourceCollection.c"
+#line 1040 "SourceCollection.c"
 }
 
 
@@ -1057,7 +1060,7 @@ GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker*
 #line 161 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	g_return_val_if_fail (IS_MARKER (marker), NULL);
 #line 162 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	_tmp0_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 162 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	list = _tmp0_;
 #line 163 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -1073,7 +1076,7 @@ GeeCollection* source_collection_unlink_marked (SourceCollection* self, Marker*
 #line 165 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp4_ = list;
 #line 165 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 165 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp6_ = _tmp5_;
 #line 165 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -1084,7 +1087,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 1088 "SourceCollection.c"
+#line 1091 "SourceCollection.c"
 	}
 #line 168 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp7_ = list;
@@ -1104,7 +1107,7 @@ 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 1108 "SourceCollection.c"
+#line 1111 "SourceCollection.c"
 }
 
 
@@ -1138,7 +1141,7 @@ 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 1142 "SourceCollection.c"
+#line 1145 "SourceCollection.c"
 }
 
 
@@ -1175,7 +1178,7 @@ 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 1179 "SourceCollection.c"
+#line 1182 "SourceCollection.c"
 }
 
 
@@ -1201,7 +1204,7 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin
 	if (_tmp2_ == 0) {
 #line 195 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		return;
-#line 1205 "SourceCollection.c"
+#line 1208 "SourceCollection.c"
 	}
 	{
 		GeeIterator* _source_it = NULL;
@@ -1215,7 +1218,7 @@ 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 1219 "SourceCollection.c"
+#line 1222 "SourceCollection.c"
 			GeeIterator* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
 			DataSource* source = NULL;
@@ -1230,7 +1233,7 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin
 			if (!_tmp6_) {
 #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 				break;
-#line 1234 "SourceCollection.c"
+#line 1237 "SourceCollection.c"
 			}
 #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 			_tmp7_ = _source_it;
@@ -1244,11 +1247,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 1248 "SourceCollection.c"
+#line 1251 "SourceCollection.c"
 		}
 #line 197 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_g_object_unref0 (_source_it);
-#line 1252 "SourceCollection.c"
+#line 1255 "SourceCollection.c"
 	}
 #line 200 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp10_ = relink;
@@ -1262,7 +1265,7 @@ 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 1266 "SourceCollection.c"
+#line 1269 "SourceCollection.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp14_ = NULL;
@@ -1275,7 +1278,7 @@ 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 1279 "SourceCollection.c"
+#line 1282 "SourceCollection.c"
 			GeeIterator* _tmp16_ = NULL;
 			gboolean _tmp17_ = FALSE;
 			DataSource* source = NULL;
@@ -1290,7 +1293,7 @@ void source_collection_relink_many (SourceCollection* self, GeeCollection* relin
 			if (!_tmp17_) {
 #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 				break;
-#line 1294 "SourceCollection.c"
+#line 1297 "SourceCollection.c"
 			}
 #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 			_tmp18_ = _source_it;
@@ -1304,11 +1307,11 @@ 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 1308 "SourceCollection.c"
+#line 1311 "SourceCollection.c"
 		}
 #line 203 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_g_object_unref0 (_source_it);
-#line 1312 "SourceCollection.c"
+#line 1315 "SourceCollection.c"
 	}
 }
 
@@ -1332,10 +1335,10 @@ 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 1336 "SourceCollection.c"
+#line 1339 "SourceCollection.c"
 	}
 #line 212 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	_tmp1_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp1_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 212 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	sources = _tmp1_;
 #line 213 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -1352,7 +1355,7 @@ 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 1356 "SourceCollection.c"
+#line 1359 "SourceCollection.c"
 	{
 		GeeArrayList* _source_list = NULL;
 		GeeArrayList* _tmp7_ = NULL;
@@ -1371,7 +1374,7 @@ static void source_collection_real_remove_backlink (SourceCollection* self, Sour
 #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp9_ = _source_list;
 #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-		_tmp10_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp10_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_tmp11_ = _tmp10_;
 #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -1380,7 +1383,7 @@ 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 1384 "SourceCollection.c"
+#line 1387 "SourceCollection.c"
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
 			gint _tmp14_ = 0;
@@ -1402,7 +1405,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 1406 "SourceCollection.c"
+#line 1409 "SourceCollection.c"
 			}
 #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 			_tmp15_ = _source_list;
@@ -1420,11 +1423,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 1424 "SourceCollection.c"
+#line 1427 "SourceCollection.c"
 		}
 #line 215 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		_g_object_unref0 (_source_list);
-#line 1428 "SourceCollection.c"
+#line 1431 "SourceCollection.c"
 	}
 #line 218 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	_tmp20_ = backlink;
@@ -1434,7 +1437,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 1438 "SourceCollection.c"
+#line 1441 "SourceCollection.c"
 }
 
 
@@ -1443,42 +1446,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 1447 "SourceCollection.c"
+#line 1450 "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 1454 "SourceCollection.c"
+#line 1457 "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 1461 "SourceCollection.c"
+#line 1464 "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 1468 "SourceCollection.c"
+#line 1471 "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 1475 "SourceCollection.c"
+#line 1478 "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 1482 "SourceCollection.c"
+#line 1485 "SourceCollection.c"
 }
 
 
@@ -1487,7 +1490,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 1491 "SourceCollection.c"
+#line 1494 "SourceCollection.c"
 }
 
 
@@ -1506,19 +1509,19 @@ 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 1510 "SourceCollection.c"
+#line 1513 "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 1516 "SourceCollection.c"
+#line 1519 "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 1522 "SourceCollection.c"
+#line 1525 "SourceCollection.c"
 }
 
 
@@ -1540,14 +1543,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 1544 "SourceCollection.c"
+#line 1547 "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 1551 "SourceCollection.c"
+#line 1554 "SourceCollection.c"
 }
 
 
@@ -1556,7 +1559,7 @@ 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 1560 "SourceCollection.c"
+#line 1563 "SourceCollection.c"
 }
 
 
@@ -1564,14 +1567,14 @@ static void source_collection_destroy_counter_instance_init (SourceCollectionDes
 	GeeArrayList* _tmp0_ = NULL;
 	GeeArrayList* _tmp1_ = NULL;
 #line 10 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	_tmp0_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
 	self->notify_list = _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
-	_tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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 1575 "SourceCollection.c"
+#line 1578 "SourceCollection.c"
 }
 
 
@@ -1587,7 +1590,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 1591 "SourceCollection.c"
+#line 1594 "SourceCollection.c"
 }
 
 
@@ -1611,25 +1614,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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -1654,7 +1657,7 @@ static void source_collection_class_init (SourceCollectionClass * klass) {
 	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 1658 "SourceCollection.c"
+#line 1661 "SourceCollection.c"
 }
 
 
@@ -1663,7 +1666,7 @@ 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 1667 "SourceCollection.c"
+#line 1670 "SourceCollection.c"
 }
 
 
@@ -1675,7 +1678,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 1679 "SourceCollection.c"
+#line 1682 "SourceCollection.c"
 }
 
 
diff --git a/src/core/SourceHoldingTank.c b/src/core/SourceHoldingTank.c
index eaf1815..1203f72 100644
--- a/src/core/SourceHoldingTank.c
+++ b/src/core/SourceHoldingTank.c
@@ -1,4 +1,4 @@
-/* SourceHoldingTank.c generated by valac 0.34.4, the Vala compiler
+/* SourceHoldingTank.c generated by valac 0.34.7, the Vala compiler
  * generated from SourceHoldingTank.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1175,7 +1175,7 @@ static void source_holding_tank_on_source_destroyed (SourceHoldingTank* self, Da
 #line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp7_ = source;
 #line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
-	_tmp8_ = singleton_collection_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp7_);
+	_tmp8_ = singleton_collection_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp7_);
 #line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp9_ = _tmp8_;
 #line 162 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1298,7 +1298,7 @@ void source_holding_tank_internal_notify_altered (SourceHoldingTank* self, DataS
 #line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp20_ = source;
 #line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
-	_tmp21_ = singleton_collection_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp20_);
+	_tmp21_ = singleton_collection_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp20_);
 #line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp22_ = _tmp21_;
 #line 187 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1338,7 +1338,7 @@ static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank*
 #line 193 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp0_ = self->priv->relinks;
 #line 193 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
-	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 193 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_tmp2_ = _tmp1_;
 #line 193 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1354,7 +1354,7 @@ static void source_holding_tank_on_source_collection_thawed (SourceHoldingTank*
 #line 197 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	copy = _tmp4_;
 #line 198 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
-	_tmp5_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp5_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 198 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	_g_object_unref0 (self->priv->relinks);
 #line 198 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
@@ -1618,7 +1618,7 @@ 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 = 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"
@@ -1638,11 +1638,11 @@ static void source_holding_tank_instance_init (SourceHoldingTank * self) {
 #line 30 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	self->priv->tank = _tmp0_;
 #line 31 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
-	_tmp1_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp1_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 31 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	self->priv->relinks = _tmp1_;
 #line 32 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
-	_tmp2_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp2_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 32 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
 	self->priv->unlinking = _tmp2_;
 #line 33 "/home/jens/Source/shotwell/src/core/SourceHoldingTank.vala"
diff --git a/src/core/SourceInterfaces.c b/src/core/SourceInterfaces.c
index 1b3292d..f65f3e2 100644
--- a/src/core/SourceInterfaces.c
+++ b/src/core/SourceInterfaces.c
@@ -1,4 +1,4 @@
-/* SourceInterfaces.c generated by valac 0.34.4, the Vala compiler
+/* SourceInterfaces.c generated by valac 0.34.7, the Vala compiler
  * generated from SourceInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/Tracker.c b/src/core/Tracker.c
index 4a340ab..93794c0 100644
--- a/src/core/Tracker.c
+++ b/src/core/Tracker.c
@@ -1,4 +1,4 @@
-/* Tracker.c generated by valac 0.34.4, the Vala compiler
+/* Tracker.c generated by valac 0.34.7, the Vala compiler
  * generated from Tracker.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/ViewCollection.c b/src/core/ViewCollection.c
index fd1e603..505093d 100644
--- a/src/core/ViewCollection.c
+++ b/src/core/ViewCollection.c
@@ -1,4 +1,4 @@
-/* ViewCollection.c generated by valac 0.34.4, the Vala compiler
+/* ViewCollection.c generated by valac 0.34.7, the Vala compiler
  * generated from ViewCollection.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -910,7 +910,7 @@ static void view_collection_real_notify_items_selected_unselected (ViewCollectio
 				GeeCollection* _tmp30_ = NULL;
 				GeeCollection* _tmp31_ = NULL;
 #line 148 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-				_tmp27_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+				_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"
 				_g_object_unref0 (sum);
 #line 148 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -1370,7 +1370,7 @@ ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection
 		GeeCollection* _tmp26_ = NULL;
 		GeeCollection* _tmp27_ = NULL;
 #line 235 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-		_tmp12_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+		_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"
@@ -1689,7 +1689,7 @@ void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, C
 #line 288 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (to_copy));
 #line 291 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	_tmp0_ = gee_array_list_new (TYPE_DATA_OBJECT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
@@ -2298,7 +2298,7 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
 						GeeArrayList* _tmp35_ = NULL;
 						DataView* _tmp36_ = NULL;
 #line 380 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-						_tmp32_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+						_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"
 						_g_object_unref0 (created_views);
 #line 380 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2367,7 +2367,7 @@ static void view_collection_add_sources (ViewCollection* self, SourceCollection*
 #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp41_ = created_views;
 #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-			_tmp42_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp42_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 			_tmp43_ = _tmp42_;
 #line 390 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -2953,7 +2953,7 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 #line 2953 "ViewCollection.c"
 					GeeArrayList* _tmp45_ = NULL;
 #line 469 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-					_tmp45_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_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"
@@ -3014,7 +3014,7 @@ static void view_collection_on_sources_altered (ViewCollection* self, DataCollec
 #line 3014 "ViewCollection.c"
 						GeeArrayList* _tmp57_ = NULL;
 #line 474 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-						_tmp57_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+						_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"
@@ -3221,7 +3221,7 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI
 #line 500 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (added));
 #line 501 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
@@ -3337,7 +3337,7 @@ static void view_collection_on_mirror_contents_added (ViewCollection* self, GeeI
 #line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp19_ = to_add;
 #line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	_tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp21_ = _tmp20_;
 #line 509 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -3591,7 +3591,7 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
 #line 3591 "ViewCollection.c"
 					GeeArrayList* _tmp19_ = NULL;
 #line 538 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-					_tmp19_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_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"
@@ -3637,7 +3637,7 @@ static void view_collection_real_notify_items_added (DataCollection* base, GeeIt
 #line 3637 "ViewCollection.c"
 					GeeArrayList* _tmp27_ = NULL;
 #line 546 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-					_tmp27_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_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"
@@ -3866,7 +3866,7 @@ static void view_collection_real_notify_items_removed (DataCollection* base, Gee
 #line 3866 "ViewCollection.c"
 							GeeArrayList* _tmp31_ = NULL;
 #line 585 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-							_tmp31_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+							_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"
@@ -4032,7 +4032,7 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle
 #line 4032 "ViewCollection.c"
 						GeeArrayList* _tmp11_ = NULL;
 #line 623 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-						_tmp11_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+						_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"
@@ -4067,7 +4067,7 @@ static void view_collection_filter_altered_items (ViewCollection* self, GeeColle
 #line 4067 "ViewCollection.c"
 						GeeArrayList* _tmp17_ = NULL;
 #line 630 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-						_tmp17_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+						_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"
@@ -5162,7 +5162,7 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource
 #line 809 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (home), NULL);
 #line 811 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	_tmp0_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 811 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet);
 #line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5473,7 +5473,7 @@ void view_collection_select_marked (ViewCollection* self, Marker* marker) {
 #line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_MARKER (marker));
 #line 871 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 871 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	selected = _tmp0_;
 #line 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5485,7 +5485,7 @@ void view_collection_select_marked (ViewCollection* self, Marker* marker) {
 #line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = selected;
 #line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp5_ = _tmp4_;
 #line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5640,7 +5640,7 @@ void view_collection_unselect_marked (ViewCollection* self, Marker* marker) {
 #line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_MARKER (marker));
 #line 908 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 908 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	unselected = _tmp0_;
 #line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5652,7 +5652,7 @@ void view_collection_unselect_marked (ViewCollection* self, Marker* marker) {
 #line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp3_ = unselected;
 #line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp5_ = _tmp4_;
 #line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5906,7 +5906,7 @@ void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* u
 #line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (IS_MARKER (select));
 #line 956 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 956 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	unselected = _tmp0_;
 #line 957 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -5916,7 +5916,7 @@ void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* u
 #line 959 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (unselected, GEE_TYPE_COLLECTION, GeeCollection));
 #line 961 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	_tmp2_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp2_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 961 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	selected = _tmp2_;
 #line 962 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6246,7 +6246,7 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
 #line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (GEE_IS_LIST (to_hide));
 #line 1032 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1032 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	unselected = _tmp0_;
 #line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6395,7 +6395,7 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
 #line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp29_ = unselected;
 #line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp31_ = _tmp30_;
 #line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6455,7 +6455,7 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show)
 #line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	g_return_if_fail (GEE_IS_LIST (to_show));
 #line 1070 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1070 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	added_selected = _tmp0_;
 #line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6755,7 +6755,7 @@ GeeCollection* view_collection_get_sources (ViewCollection* self) {
 #line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp0_ = self->priv->source_map;
 #line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+	_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	_tmp2_ = _tmp1_;
 #line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -6800,7 +6800,7 @@ gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) {
 #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"
-		_tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MAP, GeeMap));
+		_tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		_tmp4_ = _tmp3_;
 #line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7076,7 +7076,7 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) {
 #line 7076 "ViewCollection.c"
 					GeeArrayList* _tmp17_ = NULL;
 #line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-					_tmp17_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_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"
@@ -7119,7 +7119,7 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) {
 #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"
-	_tmp0_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1168 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
 #line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -7351,7 +7351,7 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy
 #line 7351 "ViewCollection.c"
 					GeeArrayList* _tmp17_ = NULL;
 #line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-					_tmp17_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_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"
@@ -7471,7 +7471,7 @@ void view_collection_internal_notify_view_altered (ViewCollection* self, DataVie
 #line 7471 "ViewCollection.c"
 			GeeHashSet* _tmp6_ = NULL;
 #line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-			_tmp6_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+			_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"
@@ -7530,7 +7530,7 @@ void view_collection_internal_notify_geometry_altered (ViewCollection* self, Dat
 #line 7530 "ViewCollection.c"
 			GeeHashSet* _tmp6_ = NULL;
 #line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-			_tmp6_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+			_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"
@@ -8315,11 +8315,11 @@ static void view_collection_toggle_lists_instance_init (ViewCollectionToggleList
 	GeeArrayList* _tmp0_ = NULL;
 	GeeArrayList* _tmp1_ = NULL;
 #line 51 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
 	self->selected = _tmp0_;
 #line 52 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	_tmp1_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
@@ -8360,69 +8360,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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -8487,7 +8487,7 @@ static void view_collection_instance_init (ViewCollection * self) {
 #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"
-	_tmp0_ = gee_hash_multi_map_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, data_collection_unref, VIEW_COLLECTION_TYPE_MONITOR_IMPL, (GBoxedCopyFunc) view_collection_monitor_ref, view_collection_monitor_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_multi_map_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, VIEW_COLLECTION_TYPE_MONITOR_IMPL, (GBoxedCopyFunc) view_collection_monitor_ref, (GDestroyNotify) view_collection_monitor_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 59 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self->priv->monitors = _tmp0_;
 #line 61 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8497,7 +8497,7 @@ static void view_collection_instance_init (ViewCollection * self) {
 #line 63 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self->priv->should_mirror = NULL;
 #line 64 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	_tmp1_ = gee_hash_set_new (TYPE_VIEW_FILTER, (GBoxedCopyFunc) view_filter_ref, view_filter_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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"
 	self->priv->filters = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SET, GeeSet);
 #line 65 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
@@ -8511,7 +8511,7 @@ static void view_collection_instance_init (ViewCollection * self) {
 #line 68 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	self->priv->frozen_geometries_altered = NULL;
 #line 72 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
-	_tmp3_ = gee_hash_map_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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"
@@ -8791,9 +8791,9 @@ 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 = 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 = view_manager_real_create_view;
+	((ViewManagerClass *) klass)->create_view = (DataView* (*)(ViewManager*, DataSource*)) view_manager_real_create_view;
 #line 8797 "ViewCollection.c"
 }
 
@@ -8855,11 +8855,12 @@ void view_manager_unref (gpointer instance) {
 
 
 static gboolean view_filter_real_predicate (ViewFilter* self, DataView* view) {
+	gboolean _tmp0_ = FALSE;
 #line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	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 FALSE;
-#line 8862 "ViewCollection.c"
+	return _tmp0_;
+#line 8863 "ViewCollection.c"
 }
 
 
@@ -8868,7 +8869,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 8871 "ViewCollection.c"
+#line 8872 "ViewCollection.c"
 }
 
 
@@ -8878,7 +8879,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 8881 "ViewCollection.c"
+#line 8882 "ViewCollection.c"
 }
 
 
@@ -8889,7 +8890,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 8892 "ViewCollection.c"
+#line 8893 "ViewCollection.c"
 }
 
 
@@ -8898,7 +8899,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 8901 "ViewCollection.c"
+#line 8902 "ViewCollection.c"
 	}
 }
 
@@ -8908,11 +8909,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 8911 "ViewCollection.c"
+#line 8912 "ViewCollection.c"
 	} else {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8915 "ViewCollection.c"
+#line 8916 "ViewCollection.c"
 	}
 }
 
@@ -8920,37 +8921,37 @@ 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 8923 "ViewCollection.c"
+#line 8924 "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 8930 "ViewCollection.c"
+#line 8931 "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 8937 "ViewCollection.c"
+#line 8938 "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 8941 "ViewCollection.c"
+#line 8942 "ViewCollection.c"
 		}
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = view_filter_ref (object);
-#line 8945 "ViewCollection.c"
+#line 8946 "ViewCollection.c"
 	} else {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = NULL;
-#line 8949 "ViewCollection.c"
+#line 8950 "ViewCollection.c"
 	}
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return NULL;
-#line 8953 "ViewCollection.c"
+#line 8954 "ViewCollection.c"
 }
 
 
@@ -8961,25 +8962,25 @@ static gchar* value_view_filter_lcopy_value (const GValue* value, guint n_collec
 	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 8964 "ViewCollection.c"
+#line 8965 "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 8970 "ViewCollection.c"
+#line 8971 "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 8974 "ViewCollection.c"
+#line 8975 "ViewCollection.c"
 	} else {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		*object_p = view_filter_ref (value->data[0].v_pointer);
-#line 8978 "ViewCollection.c"
+#line 8979 "ViewCollection.c"
 	}
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return NULL;
-#line 8982 "ViewCollection.c"
+#line 8983 "ViewCollection.c"
 }
 
 
@@ -8993,7 +8994,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 8996 "ViewCollection.c"
+#line 8997 "ViewCollection.c"
 }
 
 
@@ -9002,7 +9003,7 @@ 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 9005 "ViewCollection.c"
+#line 9006 "ViewCollection.c"
 }
 
 
@@ -9022,17 +9023,17 @@ 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 9025 "ViewCollection.c"
+#line 9026 "ViewCollection.c"
 	} else {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = NULL;
-#line 9029 "ViewCollection.c"
+#line 9030 "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 9035 "ViewCollection.c"
+#line 9036 "ViewCollection.c"
 	}
 }
 
@@ -9051,17 +9052,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 9054 "ViewCollection.c"
+#line 9055 "ViewCollection.c"
 	} else {
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 		value->data[0].v_pointer = NULL;
-#line 9058 "ViewCollection.c"
+#line 9059 "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 9064 "ViewCollection.c"
+#line 9065 "ViewCollection.c"
 	}
 }
 
@@ -9072,19 +9073,19 @@ 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 = 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 9080 "ViewCollection.c"
+#line 9081 "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 9087 "ViewCollection.c"
+#line 9088 "ViewCollection.c"
 }
 
 
@@ -9094,7 +9095,7 @@ static void view_filter_finalize (ViewFilter* obj) {
 	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 9097 "ViewCollection.c"
+#line 9098 "ViewCollection.c"
 }
 
 
@@ -9119,7 +9120,7 @@ gpointer view_filter_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
 	return instance;
-#line 9122 "ViewCollection.c"
+#line 9123 "ViewCollection.c"
 }
 
 
@@ -9132,7 +9133,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 9135 "ViewCollection.c"
+#line 9136 "ViewCollection.c"
 	}
 }
 
diff --git a/src/core/util.c b/src/core/util.c
index e398d67..0ddab1f 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -1,4 +1,4 @@
-/* util.c generated by valac 0.34.4, the Vala compiler
+/* util.c generated by valac 0.34.7, the Vala compiler
  * generated from util.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -279,7 +279,7 @@ SingletonCollection* singleton_collection_construct (GType object_type, GType g_
 	gconstpointer _tmp0_ = NULL;
 	gpointer _tmp1_ = NULL;
 #line 65 "/home/jens/Source/shotwell/src/core/util.vala"
-	self = (SingletonCollection*) gee_abstract_collection_construct (object_type, g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func);
+	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"
 	self->priv->g_type = g_type;
 #line 65 "/home/jens/Source/shotwell/src/core/util.vala"
@@ -360,7 +360,7 @@ static GeeIterator* singleton_collection_real_iterator (GeeAbstractCollection* b
 #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"
-	_tmp0_ = singleton_collection_singleton_iterator_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, self->priv->g_destroy_func, self);
+	_tmp0_ = singleton_collection_singleton_iterator_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, (GDestroyNotify) self->priv->g_destroy_func, self);
 #line 88 "/home/jens/Source/shotwell/src/core/util.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERATOR, GeeIterator);
 #line 88 "/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 = 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 = 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 = 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 = 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 = 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"
diff --git a/src/data_imports/DataImportJob.c b/src/data_imports/DataImportJob.c
index 68aba6f..8f75c81 100644
--- a/src/data_imports/DataImportJob.c
+++ b/src/data_imports/DataImportJob.c
@@ -1,4 +1,4 @@
-/* DataImportJob.c generated by valac 0.34.4, the Vala compiler
+/* DataImportJob.c generated by valac 0.34.7, the Vala compiler
  * generated from DataImportJob.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -518,7 +518,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 #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"
-	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	detected_htags = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet);
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1557,7 +1557,7 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 #line 170 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_TAG (tag), NULL);
 #line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp0_ = gee_linked_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+	_tmp0_ = gee_linked_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	components = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
 #line 1564 "DataImportJob.c"
@@ -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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
 }
 
diff --git a/src/data_imports/DataImportSource.c b/src/data_imports/DataImportSource.c
index 8558571..97e9bbd 100644
--- a/src/data_imports/DataImportSource.c
+++ b/src/data_imports/DataImportSource.c
@@ -1,4 +1,4 @@
-/* DataImportSource.c generated by valac 0.34.4, the Vala compiler
+/* DataImportSource.c generated by valac 0.34.7, the Vala compiler
  * generated from DataImportSource.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/data_imports/DataImports.c b/src/data_imports/DataImports.c
index 8902b79..b991c53 100644
--- a/src/data_imports/DataImports.c
+++ b/src/data_imports/DataImports.c
@@ -1,4 +1,4 @@
-/* DataImports.c generated by valac 0.34.4, the Vala compiler
+/* DataImports.c generated by valac 0.34.7, the Vala compiler
  * generated from DataImports.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/data_imports/DataImportsPluginHost.c b/src/data_imports/DataImportsPluginHost.c
index 64d9337..3203518 100644
--- a/src/data_imports/DataImportsPluginHost.c
+++ b/src/data_imports/DataImportsPluginHost.c
@@ -1,4 +1,4 @@
-/* DataImportsPluginHost.c generated by valac 0.34.4, the Vala compiler
+/* DataImportsPluginHost.c generated by valac 0.34.7, the Vala compiler
  * generated from DataImportsPluginHost.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -736,15 +736,15 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
 #line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_plugin_host_update_import_progress_pane (_tmp0_, _tmp1_, _tmp2_);
 #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = sorted_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, _spit_data_imports_import_job_comparator_comparator, NULL);
+	_tmp3_ = sorted_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, _spit_data_imports_import_job_comparator_comparator, NULL);
 #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	jobs = _tmp3_;
 #line 28 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp4_ = gee_array_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL);
+	_tmp4_ = gee_array_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
 #line 28 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	already_imported = _tmp4_;
 #line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp5_ = gee_array_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL);
+	_tmp5_ = gee_array_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
 #line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	failed = _tmp5_;
 #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1104,7 +1104,7 @@ void spit_data_imports_core_importer_finalize_import (SpitDataImportsCoreImporte
 #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	db_name = _tmp8_;
 #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, batch_import_job_unref, NULL, NULL, NULL);
+	_tmp9_ = 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_;
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
diff --git a/src/data_imports/DataImportsUI.c b/src/data_imports/DataImportsUI.c
index 128ad1c..5a1c46a 100644
--- a/src/data_imports/DataImportsUI.c
+++ b/src/data_imports/DataImportsUI.c
@@ -1,4 +1,4 @@
-/* DataImportsUI.c generated by valac 0.34.4, the Vala compiler
+/* DataImportsUI.c generated by valac 0.34.7, the Vala compiler
  * generated from DataImportsUI.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/DatabaseTable.c b/src/db/DatabaseTable.c
index 790a6df..cd0a93e 100644
--- a/src/db/DatabaseTable.c
+++ b/src/db/DatabaseTable.c
@@ -1,4 +1,4 @@
-/* DatabaseTable.c generated by valac 0.34.4, the Vala compiler
+/* DatabaseTable.c generated by valac 0.34.7, the Vala compiler
  * generated from DatabaseTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/Db.c b/src/db/Db.c
index 4133a36..eeaf220 100644
--- a/src/db/Db.c
+++ b/src/db/Db.c
@@ -1,4 +1,4 @@
-/* Db.c generated by valac 0.34.4, the Vala compiler
+/* Db.c generated by valac 0.34.7, the Vala compiler
  * generated from Db.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/EventTable.c b/src/db/EventTable.c
index 60feebf..65a2508 100644
--- a/src/db/EventTable.c
+++ b/src/db/EventTable.c
@@ -1,4 +1,4 @@
-/* EventTable.c generated by valac 0.34.4, the Vala compiler
+/* EventTable.c generated by valac 0.34.7, the Vala compiler
  * generated from EventTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1378,7 +1378,7 @@ GeeArrayList* event_table_get_events (EventTable* self) {
 #line 168 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
 #line 170 "/home/jens/Source/shotwell/src/db/EventTable.vala"
-	_tmp4_ = gee_array_list_new (TYPE_EVENT_ROW, (GBoxedCopyFunc) event_row_ref, event_row_unref, NULL, NULL, NULL);
+	_tmp4_ = gee_array_list_new (TYPE_EVENT_ROW, (GBoxedCopyFunc) event_row_ref, (GDestroyNotify) event_row_unref, NULL, NULL, NULL);
 #line 170 "/home/jens/Source/shotwell/src/db/EventTable.vala"
 	event_rows = _tmp4_;
 #line 1381 "EventTable.c"
diff --git a/src/db/PhotoTable.c b/src/db/PhotoTable.c
index 4cd6830..da28230 100644
--- a/src/db/PhotoTable.c
+++ b/src/db/PhotoTable.c
@@ -1,4 +1,4 @@
-/* PhotoTable.c generated by valac 0.34.4, the Vala compiler
+/* PhotoTable.c generated by valac 0.34.7, the Vala compiler
  * generated from PhotoTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -3264,7 +3264,7 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) {
 #line 447 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
 #line 449 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = gee_array_list_new (TYPE_PHOTO_ROW, (GBoxedCopyFunc) photo_row_ref, photo_row_unref, NULL, NULL, NULL);
+	_tmp4_ = gee_array_list_new (TYPE_PHOTO_ROW, (GBoxedCopyFunc) photo_row_ref, (GDestroyNotify) photo_row_unref, NULL, NULL, NULL);
 #line 449 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	all = _tmp4_;
 #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -4797,7 +4797,7 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) {
 #line 621 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
 #line 623 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp4_ = gee_array_list_new (TYPE_PHOTO_ID, (GBoxedCopyFunc) photo_id_dup, photo_id_free, NULL, NULL, NULL);
+	_tmp4_ = gee_array_list_new (TYPE_PHOTO_ID, (GBoxedCopyFunc) photo_id_dup, (GDestroyNotify) photo_id_free, NULL, NULL, NULL);
 #line 623 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	photo_ids = _tmp4_;
 #line 4783 "PhotoTable.c"
@@ -5116,7 +5116,7 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event
 #line 683 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
 #line 685 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp9_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+	_tmp9_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 685 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_result_ = _tmp9_;
 #line 5102 "PhotoTable.c"
@@ -5752,7 +5752,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 #line 5731 "PhotoTable.c"
 		}
 #line 795 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp13_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+		_tmp13_ = 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 795 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		map = _tmp13_;
 #line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6061,7 +6061,7 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = transformations;
 #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MAP, GeeMap));
+		_tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp4_ = _tmp3_;
 #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6100,7 +6100,7 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_ = transformations;
 #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		_tmp10_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_MAP, GeeMap));
+		_tmp10_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp11_ = _tmp10_;
 #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6281,9 +6281,9 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 	gchar* trans = NULL;
 	PhotoID _tmp0_ = {0};
 	gchar* _tmp1_ = NULL;
-	PhotoID _tmp37_ = {0};
-	const gchar* _tmp38_ = NULL;
-	gboolean _tmp39_ = FALSE;
+	PhotoID _tmp38_ = {0};
+	const gchar* _tmp39_ = NULL;
+	gboolean _tmp40_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 841 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
@@ -6501,6 +6501,8 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 	__finally18:
 #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 6483 "PhotoTable.c"
+		gboolean _tmp37_ = FALSE;
 #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (trans);
 #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6508,22 +6510,22 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		g_clear_error (&_inner_error_);
 #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return FALSE;
-#line 6491 "PhotoTable.c"
+		return _tmp37_;
+#line 6493 "PhotoTable.c"
 	}
 #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp37_ = *photo_id;
+	_tmp38_ = *photo_id;
 #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp38_ = trans;
+	_tmp39_ = trans;
 #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp39_ = photo_table_set_raw_transformations (self, &_tmp37_, _tmp38_);
+	_tmp40_ = photo_table_set_raw_transformations (self, &_tmp38_, _tmp39_);
 #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = _tmp39_;
+	result = _tmp40_;
 #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (trans);
 #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 6505 "PhotoTable.c"
+#line 6507 "PhotoTable.c"
 }
 
 
@@ -6533,9 +6535,9 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 	PhotoID _tmp0_ = {0};
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-	PhotoID _tmp21_ = {0};
-	const gchar* _tmp22_ = NULL;
-	gboolean _tmp23_ = FALSE;
+	PhotoID _tmp22_ = {0};
+	const gchar* _tmp23_ = NULL;
+	gboolean _tmp24_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
@@ -6559,7 +6561,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 		_g_free0 (trans);
 #line 873 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 6541 "PhotoTable.c"
+#line 6543 "PhotoTable.c"
 	}
 	{
 		GKeyFile* keyfile = NULL;
@@ -6603,7 +6605,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_key_file_unref0 (keyfile);
-#line 6585 "PhotoTable.c"
+#line 6587 "PhotoTable.c"
 			goto __catch19_g_error;
 		}
 #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6616,7 +6618,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 			_g_free0 (trans);
 #line 878 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return result;
-#line 6598 "PhotoTable.c"
+#line 6600 "PhotoTable.c"
 		}
 #line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp11_ = keyfile;
@@ -6634,7 +6636,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 			_g_free0 (trans);
 #line 881 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return result;
-#line 6616 "PhotoTable.c"
+#line 6618 "PhotoTable.c"
 		}
 #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp14_ = keyfile;
@@ -6646,7 +6648,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_key_file_unref0 (keyfile);
-#line 6628 "PhotoTable.c"
+#line 6630 "PhotoTable.c"
 			goto __catch19_g_error;
 		}
 #line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6665,7 +6667,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 		_vala_assert (_tmp19_ != NULL, "trans != null");
 #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_key_file_unref0 (keyfile);
-#line 6647 "PhotoTable.c"
+#line 6649 "PhotoTable.c"
 	}
 	goto __finally19;
 	__catch19_g_error:
@@ -6682,11 +6684,13 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 		g_error ("PhotoTable.vala:889: %s", _tmp20_);
 #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_error_free0 (err);
-#line 6664 "PhotoTable.c"
+#line 6666 "PhotoTable.c"
 	}
 	__finally19:
 #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 6671 "PhotoTable.c"
+		gboolean _tmp21_ = FALSE;
 #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (trans);
 #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6694,22 +6698,22 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		g_clear_error (&_inner_error_);
 #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		return FALSE;
-#line 6677 "PhotoTable.c"
+		return _tmp21_;
+#line 6681 "PhotoTable.c"
 	}
 #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp21_ = *photo_id;
+	_tmp22_ = *photo_id;
 #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp22_ = trans;
+	_tmp23_ = trans;
 #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp23_ = photo_table_set_raw_transformations (self, &_tmp21_, _tmp22_);
+	_tmp24_ = photo_table_set_raw_transformations (self, &_tmp22_, _tmp23_);
 #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	result = _tmp23_;
+	result = _tmp24_;
 #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (trans);
 #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 6691 "PhotoTable.c"
+#line 6695 "PhotoTable.c"
 }
 
 
@@ -6742,7 +6746,7 @@ gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* phot
 		result = FALSE;
 #line 897 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 6724 "PhotoTable.c"
+#line 6728 "PhotoTable.c"
 	}
 #line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = *photo_id;
@@ -6754,7 +6758,7 @@ gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* phot
 	result = _tmp6_;
 #line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 6736 "PhotoTable.c"
+#line 6740 "PhotoTable.c"
 }
 
 
@@ -6793,27 +6797,27 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 	if (_tmp2_ != NULL) {
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp1_ = TRUE;
-#line 6775 "PhotoTable.c"
+#line 6779 "PhotoTable.c"
 	} else {
 		const gchar* _tmp3_ = NULL;
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp3_ = thumbnail_md5;
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 6782 "PhotoTable.c"
+#line 6786 "PhotoTable.c"
 	}
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_) {
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = TRUE;
-#line 6788 "PhotoTable.c"
+#line 6792 "PhotoTable.c"
 	} else {
 		const gchar* _tmp4_ = NULL;
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp4_ = md5;
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = _tmp4_ != NULL;
-#line 6795 "PhotoTable.c"
+#line 6799 "PhotoTable.c"
 	}
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp0_, "file != null || thumbnail_md5 != null || md5 != null");
@@ -6827,7 +6831,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 	_tmp6_ = file;
 #line 911 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp6_ != NULL) {
-#line 6809 "PhotoTable.c"
+#line 6813 "PhotoTable.c"
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6840,7 +6844,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		sql = _tmp8_;
 #line 913 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		first = FALSE;
-#line 6822 "PhotoTable.c"
+#line 6826 "PhotoTable.c"
 	}
 #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = thumbnail_md5;
@@ -6848,18 +6852,18 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 	if (_tmp10_ != NULL) {
 #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_ = TRUE;
-#line 6830 "PhotoTable.c"
+#line 6834 "PhotoTable.c"
 	} else {
 		const gchar* _tmp11_ = NULL;
 #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp11_ = md5;
 #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_ = _tmp11_ != NULL;
-#line 6837 "PhotoTable.c"
+#line 6841 "PhotoTable.c"
 	}
 #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp9_) {
-#line 6841 "PhotoTable.c"
+#line 6845 "PhotoTable.c"
 		gboolean _tmp12_ = FALSE;
 		const gchar* _tmp17_ = NULL;
 		const gchar* _tmp20_ = NULL;
@@ -6872,7 +6876,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp12_ = first;
 #line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp12_) {
-#line 6854 "PhotoTable.c"
+#line 6858 "PhotoTable.c"
 			const gchar* _tmp13_ = NULL;
 			gchar* _tmp14_ = NULL;
 #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6883,7 +6887,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 			_g_free0 (sql);
 #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			sql = _tmp14_;
-#line 6865 "PhotoTable.c"
+#line 6869 "PhotoTable.c"
 		} else {
 			const gchar* _tmp15_ = NULL;
 			gchar* _tmp16_ = NULL;
@@ -6895,7 +6899,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 			_g_free0 (sql);
 #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			sql = _tmp16_;
-#line 6877 "PhotoTable.c"
+#line 6881 "PhotoTable.c"
 		}
 #line 921 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		first = FALSE;
@@ -6903,7 +6907,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp17_ = md5;
 #line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp17_ != NULL) {
-#line 6885 "PhotoTable.c"
+#line 6889 "PhotoTable.c"
 			const gchar* _tmp18_ = NULL;
 			gchar* _tmp19_ = NULL;
 #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6914,19 +6918,19 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 			_g_free0 (sql);
 #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			sql = _tmp19_;
-#line 6896 "PhotoTable.c"
+#line 6900 "PhotoTable.c"
 		}
 #line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp20_ = thumbnail_md5;
 #line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp20_ != NULL) {
-#line 6902 "PhotoTable.c"
+#line 6906 "PhotoTable.c"
 			const gchar* _tmp21_ = NULL;
 #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 6908 "PhotoTable.c"
+#line 6912 "PhotoTable.c"
 				const gchar* _tmp22_ = NULL;
 				gchar* _tmp23_ = NULL;
 #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6937,7 +6941,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 				_g_free0 (sql);
 #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				sql = _tmp23_;
-#line 6919 "PhotoTable.c"
+#line 6923 "PhotoTable.c"
 			} else {
 				const gchar* _tmp24_ = NULL;
 				gchar* _tmp25_ = NULL;
@@ -6949,7 +6953,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 				_g_free0 (sql);
 #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				sql = _tmp25_;
-#line 6931 "PhotoTable.c"
+#line 6935 "PhotoTable.c"
 			}
 		}
 #line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6964,7 +6968,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp28_ = file_format;
 #line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp28_ != PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 6946 "PhotoTable.c"
+#line 6950 "PhotoTable.c"
 			const gchar* _tmp29_ = NULL;
 			gchar* _tmp30_ = NULL;
 #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6975,7 +6979,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 			_g_free0 (sql);
 #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			sql = _tmp30_;
-#line 6957 "PhotoTable.c"
+#line 6961 "PhotoTable.c"
 		}
 #line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp31_ = sql;
@@ -6985,7 +6989,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_g_free0 (sql);
 #line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		sql = _tmp32_;
-#line 6967 "PhotoTable.c"
+#line 6971 "PhotoTable.c"
 	}
 #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp33_ = database_table_db;
@@ -7009,7 +7013,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 	_tmp38_ = file;
 #line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp38_ != NULL) {
-#line 6991 "PhotoTable.c"
+#line 6995 "PhotoTable.c"
 		sqlite3_stmt* _tmp39_ = NULL;
 		gint _tmp40_ = 0;
 		GFile* _tmp41_ = NULL;
@@ -7037,13 +7041,13 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp45_ = res;
 #line 950 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_vala_assert (_tmp45_ == SQLITE_OK, "res == Sqlite.OK");
-#line 7019 "PhotoTable.c"
+#line 7023 "PhotoTable.c"
 	}
 #line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp46_ = thumbnail_md5;
 #line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp46_ != NULL) {
-#line 7025 "PhotoTable.c"
+#line 7029 "PhotoTable.c"
 		sqlite3_stmt* _tmp47_ = NULL;
 		gint _tmp48_ = 0;
 		const gchar* _tmp49_ = NULL;
@@ -7071,13 +7075,13 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp53_ = res;
 #line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_vala_assert (_tmp53_ == SQLITE_OK, "res == Sqlite.OK");
-#line 7053 "PhotoTable.c"
+#line 7057 "PhotoTable.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp54_ = md5;
 #line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp54_ != NULL) {
-#line 7059 "PhotoTable.c"
+#line 7063 "PhotoTable.c"
 		sqlite3_stmt* _tmp55_ = NULL;
 		gint _tmp56_ = 0;
 		const gchar* _tmp57_ = NULL;
@@ -7105,7 +7109,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp61_ = res;
 #line 960 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_vala_assert (_tmp61_ == SQLITE_OK, "res == Sqlite.OK");
-#line 7087 "PhotoTable.c"
+#line 7091 "PhotoTable.c"
 	}
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp64_ = thumbnail_md5;
@@ -7113,32 +7117,32 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 	if (_tmp64_ != NULL) {
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp63_ = TRUE;
-#line 7095 "PhotoTable.c"
+#line 7099 "PhotoTable.c"
 	} else {
 		const gchar* _tmp65_ = NULL;
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp65_ = md5;
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp63_ = _tmp65_ != NULL;
-#line 7102 "PhotoTable.c"
+#line 7106 "PhotoTable.c"
 	}
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp63_) {
-#line 7106 "PhotoTable.c"
+#line 7110 "PhotoTable.c"
 		PhotoFileFormat _tmp66_ = 0;
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp66_ = file_format;
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp62_ = _tmp66_ != PHOTO_FILE_FORMAT_UNKNOWN;
-#line 7112 "PhotoTable.c"
+#line 7116 "PhotoTable.c"
 	} else {
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp62_ = FALSE;
-#line 7116 "PhotoTable.c"
+#line 7120 "PhotoTable.c"
 	}
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp62_) {
-#line 7120 "PhotoTable.c"
+#line 7124 "PhotoTable.c"
 		sqlite3_stmt* _tmp67_ = NULL;
 		gint _tmp68_ = 0;
 		PhotoFileFormat _tmp69_ = 0;
@@ -7163,7 +7167,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp72_ = res;
 #line 965 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK");
-#line 7145 "PhotoTable.c"
+#line 7149 "PhotoTable.c"
 	}
 #line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = stmt;
@@ -7171,7 +7175,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 	_g_free0 (sql);
 #line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 7153 "PhotoTable.c"
+#line 7157 "PhotoTable.c"
 }
 
 
@@ -7219,7 +7223,7 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar*
 		_sqlite3_finalize0 (stmt);
 #line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 7201 "PhotoTable.c"
+#line 7205 "PhotoTable.c"
 	} else {
 		gint _tmp8_ = 0;
 #line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7232,7 +7236,7 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar*
 			_sqlite3_finalize0 (stmt);
 #line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return result;
-#line 7214 "PhotoTable.c"
+#line 7218 "PhotoTable.c"
 		} else {
 			gint _tmp9_ = 0;
 #line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7245,12 +7249,12 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar*
 			_sqlite3_finalize0 (stmt);
 #line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return result;
-#line 7227 "PhotoTable.c"
+#line 7231 "PhotoTable.c"
 		}
 	}
 #line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 7232 "PhotoTable.c"
+#line 7236 "PhotoTable.c"
 }
 
 
@@ -7261,11 +7265,11 @@ static void _vala_array_add2 (PhotoID** array, int* length, int* size, const Pho
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*array = g_renew (PhotoID, *array, *size);
-#line 7243 "PhotoTable.c"
+#line 7247 "PhotoTable.c"
 	}
 #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	(*array)[(*length)++] = *value;
-#line 7247 "PhotoTable.c"
+#line 7251 "PhotoTable.c"
 }
 
 
@@ -7318,7 +7322,7 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch
 	res = _tmp7_;
 #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	while (TRUE) {
-#line 7300 "PhotoTable.c"
+#line 7304 "PhotoTable.c"
 		gint _tmp8_ = 0;
 		PhotoID* _tmp9_ = NULL;
 		gint _tmp9__length1 = 0;
@@ -7333,7 +7337,7 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch
 		if (!(_tmp8_ == SQLITE_ROW)) {
 #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			break;
-#line 7315 "PhotoTable.c"
+#line 7319 "PhotoTable.c"
 		}
 #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_ = ids;
@@ -7353,7 +7357,7 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch
 		_tmp14_ = sqlite3_step (_tmp13_);
 #line 997 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		res = _tmp14_;
-#line 7335 "PhotoTable.c"
+#line 7339 "PhotoTable.c"
 	}
 #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = ids;
@@ -7363,7 +7367,7 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch
 	if (result_length1) {
 #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*result_length1 = _tmp15__length1;
-#line 7345 "PhotoTable.c"
+#line 7349 "PhotoTable.c"
 	}
 #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp15_;
@@ -7371,7 +7375,7 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch
 	_sqlite3_finalize0 (stmt);
 #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 7353 "PhotoTable.c"
+#line 7357 "PhotoTable.c"
 }
 
 
@@ -7389,17 +7393,17 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc
 	_tmp1_ = backlinks;
 #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_ != NULL) {
-#line 7371 "PhotoTable.c"
+#line 7375 "PhotoTable.c"
 		const gchar* _tmp2_ = NULL;
 #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = backlinks;
 #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = _tmp2_;
-#line 7377 "PhotoTable.c"
+#line 7381 "PhotoTable.c"
 	} else {
 #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = "";
-#line 7381 "PhotoTable.c"
+#line 7385 "PhotoTable.c"
 	}
 #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = *photo_id;
@@ -7415,7 +7419,7 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc
 			g_propagate_error (error, _inner_error_);
 #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7397 "PhotoTable.c"
+#line 7401 "PhotoTable.c"
 		} else {
 #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.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);
@@ -7423,7 +7427,7 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc
 			g_clear_error (&_inner_error_);
 #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7405 "PhotoTable.c"
+#line 7409 "PhotoTable.c"
 		}
 	}
 }
@@ -7464,7 +7468,7 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI
 			g_propagate_error (error, _inner_error_);
 #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7446 "PhotoTable.c"
+#line 7450 "PhotoTable.c"
 		} else {
 #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.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);
@@ -7472,7 +7476,7 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI
 			g_clear_error (&_inner_error_);
 #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7454 "PhotoTable.c"
+#line 7458 "PhotoTable.c"
 		}
 	}
 #line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7481,7 +7485,7 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI
 	_tmp6_ = *editable_id;
 #line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_->editable_id = _tmp6_;
-#line 7463 "PhotoTable.c"
+#line 7467 "PhotoTable.c"
 }
 
 
@@ -7511,7 +7515,7 @@ void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** erro
 			g_propagate_error (error, _inner_error_);
 #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7493 "PhotoTable.c"
+#line 7497 "PhotoTable.c"
 		} else {
 #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.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);
@@ -7519,14 +7523,14 @@ void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** erro
 			g_clear_error (&_inner_error_);
 #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7501 "PhotoTable.c"
+#line 7505 "PhotoTable.c"
 		}
 	}
 #line 1016 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = row;
 #line 1016 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	backing_photo_id_init (&_tmp3_->editable_id, BACKING_PHOTO_ID_INVALID);
-#line 7508 "PhotoTable.c"
+#line 7512 "PhotoTable.c"
 }
 
 
@@ -7546,11 +7550,11 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole
 	if (_tmp1_) {
 #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = 1;
-#line 7528 "PhotoTable.c"
+#line 7532 "PhotoTable.c"
 	} else {
 #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = 0;
-#line 7532 "PhotoTable.c"
+#line 7536 "PhotoTable.c"
 	}
 #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = *photo_id;
@@ -7566,7 +7570,7 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole
 			g_propagate_error (error, _inner_error_);
 #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7548 "PhotoTable.c"
+#line 7552 "PhotoTable.c"
 		} else {
 #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.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);
@@ -7574,7 +7578,7 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole
 			g_clear_error (&_inner_error_);
 #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7556 "PhotoTable.c"
+#line 7560 "PhotoTable.c"
 		}
 	}
 }
@@ -7610,7 +7614,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 	switch (_tmp0_) {
 #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 7592 "PhotoTable.c"
+#line 7596 "PhotoTable.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7621,11 +7625,11 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 			col = _tmp1_;
 #line 1030 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			break;
-#line 7603 "PhotoTable.c"
+#line 7607 "PhotoTable.c"
 		}
 #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 7607 "PhotoTable.c"
+#line 7611 "PhotoTable.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7636,11 +7640,11 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 			col = _tmp2_;
 #line 1034 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			break;
-#line 7618 "PhotoTable.c"
+#line 7622 "PhotoTable.c"
 		}
 #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 7622 "PhotoTable.c"
+#line 7626 "PhotoTable.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7651,13 +7655,13 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 			col = _tmp3_;
 #line 1038 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			break;
-#line 7633 "PhotoTable.c"
+#line 7637 "PhotoTable.c"
 		}
 		default:
 		{
 #line 1041 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_assert_not_reached ();
-#line 7639 "PhotoTable.c"
+#line 7643 "PhotoTable.c"
 		}
 	}
 #line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7698,7 +7702,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 			_g_free0 (col);
 #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7680 "PhotoTable.c"
+#line 7684 "PhotoTable.c"
 		} else {
 #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (col);
@@ -7708,7 +7712,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 			g_clear_error (&_inner_error_);
 #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7690 "PhotoTable.c"
+#line 7694 "PhotoTable.c"
 		}
 	}
 #line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7717,7 +7721,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 	_tmp16_ = _tmp15_.id;
 #line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp16_ != BACKING_PHOTO_ID_INVALID) {
-#line 7699 "PhotoTable.c"
+#line 7703 "PhotoTable.c"
 		PhotoRow* _tmp17_ = NULL;
 		PhotoID _tmp18_ = {0};
 		gint64 _tmp19_ = 0LL;
@@ -7750,7 +7754,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 				_g_free0 (col);
 #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 7732 "PhotoTable.c"
+#line 7736 "PhotoTable.c"
 			} else {
 #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_free0 (col);
@@ -7760,13 +7764,13 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 				g_clear_error (&_inner_error_);
 #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 7742 "PhotoTable.c"
+#line 7746 "PhotoTable.c"
 			}
 		}
 	}
 #line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (col);
-#line 7748 "PhotoTable.c"
+#line 7752 "PhotoTable.c"
 }
 
 
@@ -7795,7 +7799,7 @@ void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDevelop
 			g_propagate_error (error, _inner_error_);
 #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7777 "PhotoTable.c"
+#line 7781 "PhotoTable.c"
 		} else {
 #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.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);
@@ -7803,7 +7807,7 @@ void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDevelop
 			g_clear_error (&_inner_error_);
 #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7785 "PhotoTable.c"
+#line 7789 "PhotoTable.c"
 		}
 	}
 }
@@ -7814,7 +7818,7 @@ static void photo_table_class_init (PhotoTableClass * klass) {
 	photo_table_parent_class = g_type_class_peek_parent (klass);
 #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	((DatabaseTableClass *) klass)->finalize = photo_table_finalize;
-#line 7796 "PhotoTable.c"
+#line 7800 "PhotoTable.c"
 }
 
 
@@ -7828,7 +7832,7 @@ static void photo_table_finalize (DatabaseTable* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_TABLE, PhotoTable);
 #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	DATABASE_TABLE_CLASS (photo_table_parent_class)->finalize (obj);
-#line 7810 "PhotoTable.c"
+#line 7814 "PhotoTable.c"
 }
 
 
@@ -7852,7 +7856,7 @@ void backing_photo_id_init (BackingPhotoID *self, gint64 id) {
 	_tmp0_ = id;
 #line 1073 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	(*self).id = _tmp0_;
-#line 7834 "PhotoTable.c"
+#line 7838 "PhotoTable.c"
 }
 
 
@@ -7865,7 +7869,7 @@ gboolean backing_photo_id_is_invalid (BackingPhotoID *self) {
 	result = _tmp0_ == BACKING_PHOTO_ID_INVALID;
 #line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 7847 "PhotoTable.c"
+#line 7851 "PhotoTable.c"
 }
 
 
@@ -7878,7 +7882,7 @@ gboolean backing_photo_id_is_valid (BackingPhotoID *self) {
 	result = _tmp0_ != BACKING_PHOTO_ID_INVALID;
 #line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 7860 "PhotoTable.c"
+#line 7864 "PhotoTable.c"
 }
 
 
@@ -7890,14 +7894,14 @@ BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self) {
 	memcpy (dup, self, sizeof (BackingPhotoID));
 #line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return dup;
-#line 7872 "PhotoTable.c"
+#line 7876 "PhotoTable.c"
 }
 
 
 void backing_photo_id_free (BackingPhotoID* self) {
 #line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_free (self);
-#line 7879 "PhotoTable.c"
+#line 7883 "PhotoTable.c"
 }
 
 
@@ -7937,7 +7941,7 @@ gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo*
 		result = FALSE;
 #line 1097 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 7919 "PhotoTable.c"
+#line 7923 "PhotoTable.c"
 	}
 #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = self->timestamp;
@@ -7951,7 +7955,7 @@ gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo*
 	result = _tmp3_ == ((time_t) _tmp6_);
 #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 7933 "PhotoTable.c"
+#line 7937 "PhotoTable.c"
 }
 
 
@@ -7980,7 +7984,7 @@ gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) {
 		result = FALSE;
 #line 1104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 7962 "PhotoTable.c"
+#line 7966 "PhotoTable.c"
 	}
 #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = self->timestamp;
@@ -7994,7 +7998,7 @@ gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) {
 	result = _tmp3_ != ((time_t) _tmp6_);
 #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 7976 "PhotoTable.c"
+#line 7980 "PhotoTable.c"
 }
 
 
@@ -8072,7 +8076,7 @@ void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from)
 	_tmp16_ = _tmp15_->original_orientation;
 #line 1118 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self->original_orientation = _tmp16_;
-#line 8054 "PhotoTable.c"
+#line 8058 "PhotoTable.c"
 }
 
 
@@ -8082,21 +8086,21 @@ BackingPhotoRow* backing_photo_row_construct (GType object_type) {
 	self = (BackingPhotoRow*) g_type_create_instance (object_type);
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return self;
-#line 8064 "PhotoTable.c"
+#line 8068 "PhotoTable.c"
 }
 
 
 BackingPhotoRow* backing_photo_row_new (void) {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return backing_photo_row_construct (TYPE_BACKING_PHOTO_ROW);
-#line 8071 "PhotoTable.c"
+#line 8075 "PhotoTable.c"
 }
 
 
 static void value_backing_photo_row_init (GValue* value) {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	value->data[0].v_pointer = NULL;
-#line 8078 "PhotoTable.c"
+#line 8082 "PhotoTable.c"
 }
 
 
@@ -8105,7 +8109,7 @@ static void value_backing_photo_row_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_row_unref (value->data[0].v_pointer);
-#line 8087 "PhotoTable.c"
+#line 8091 "PhotoTable.c"
 	}
 }
 
@@ -8115,11 +8119,11 @@ static void value_backing_photo_row_copy_value (const GValue* src_value, GValue*
 	if (src_value->data[0].v_pointer) {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		dest_value->data[0].v_pointer = backing_photo_row_ref (src_value->data[0].v_pointer);
-#line 8097 "PhotoTable.c"
+#line 8101 "PhotoTable.c"
 	} else {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8101 "PhotoTable.c"
+#line 8105 "PhotoTable.c"
 	}
 }
 
@@ -8127,37 +8131,37 @@ static void value_backing_photo_row_copy_value (const GValue* src_value, GValue*
 static gpointer value_backing_photo_row_peek_pointer (const GValue* value) {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return value->data[0].v_pointer;
-#line 8109 "PhotoTable.c"
+#line 8113 "PhotoTable.c"
 }
 
 
 static gchar* value_backing_photo_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (collect_values[0].v_pointer) {
-#line 8116 "PhotoTable.c"
+#line 8120 "PhotoTable.c"
 		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) {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8123 "PhotoTable.c"
+#line 8127 "PhotoTable.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.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 8127 "PhotoTable.c"
+#line 8131 "PhotoTable.c"
 		}
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = backing_photo_row_ref (object);
-#line 8131 "PhotoTable.c"
+#line 8135 "PhotoTable.c"
 	} else {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 8135 "PhotoTable.c"
+#line 8139 "PhotoTable.c"
 	}
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return NULL;
-#line 8139 "PhotoTable.c"
+#line 8143 "PhotoTable.c"
 }
 
 
@@ -8168,25 +8172,25 @@ static gchar* value_backing_photo_row_lcopy_value (const GValue* value, guint n_
 	if (!object_p) {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8150 "PhotoTable.c"
+#line 8154 "PhotoTable.c"
 	}
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (!value->data[0].v_pointer) {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*object_p = NULL;
-#line 8156 "PhotoTable.c"
+#line 8160 "PhotoTable.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8160 "PhotoTable.c"
+#line 8164 "PhotoTable.c"
 	} else {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*object_p = backing_photo_row_ref (value->data[0].v_pointer);
-#line 8164 "PhotoTable.c"
+#line 8168 "PhotoTable.c"
 	}
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return NULL;
-#line 8168 "PhotoTable.c"
+#line 8172 "PhotoTable.c"
 }
 
 
@@ -8200,7 +8204,7 @@ GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return G_PARAM_SPEC (spec);
-#line 8182 "PhotoTable.c"
+#line 8186 "PhotoTable.c"
 }
 
 
@@ -8209,7 +8213,7 @@ gpointer value_get_backing_photo_row (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW), NULL);
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return value->data[0].v_pointer;
-#line 8191 "PhotoTable.c"
+#line 8195 "PhotoTable.c"
 }
 
 
@@ -8229,17 +8233,17 @@ void value_set_backing_photo_row (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_row_ref (value->data[0].v_pointer);
-#line 8211 "PhotoTable.c"
+#line 8215 "PhotoTable.c"
 	} else {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 8215 "PhotoTable.c"
+#line 8219 "PhotoTable.c"
 	}
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (old) {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_row_unref (old);
-#line 8221 "PhotoTable.c"
+#line 8225 "PhotoTable.c"
 	}
 }
 
@@ -8258,17 +8262,17 @@ void value_take_backing_photo_row (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = v_object;
-#line 8240 "PhotoTable.c"
+#line 8244 "PhotoTable.c"
 	} else {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 8244 "PhotoTable.c"
+#line 8248 "PhotoTable.c"
 	}
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (old) {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_row_unref (old);
-#line 8250 "PhotoTable.c"
+#line 8254 "PhotoTable.c"
 	}
 }
 
@@ -8278,7 +8282,7 @@ static void backing_photo_row_class_init (BackingPhotoRowClass * klass) {
 	backing_photo_row_parent_class = g_type_class_peek_parent (klass);
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	((BackingPhotoRowClass *) klass)->finalize = backing_photo_row_finalize;
-#line 8260 "PhotoTable.c"
+#line 8264 "PhotoTable.c"
 }
 
 
@@ -8287,7 +8291,7 @@ static void backing_photo_row_instance_init (BackingPhotoRow * self) {
 	self->filepath = NULL;
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self->ref_count = 1;
-#line 8269 "PhotoTable.c"
+#line 8273 "PhotoTable.c"
 }
 
 
@@ -8299,7 +8303,7 @@ static void backing_photo_row_finalize (BackingPhotoRow* obj) {
 	g_signal_handlers_destroy (self);
 #line 1088 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (self->filepath);
-#line 8281 "PhotoTable.c"
+#line 8285 "PhotoTable.c"
 }
 
 
@@ -8324,7 +8328,7 @@ gpointer backing_photo_row_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return instance;
-#line 8306 "PhotoTable.c"
+#line 8310 "PhotoTable.c"
 }
 
 
@@ -8337,7 +8341,7 @@ void backing_photo_row_unref (gpointer instance) {
 		BACKING_PHOTO_ROW_GET_CLASS (self)->finalize (self);
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8319 "PhotoTable.c"
+#line 8323 "PhotoTable.c"
 	}
 }
 
@@ -8381,26 +8385,26 @@ static BackingPhotoTable* backing_photo_table_construct (GType object_type) {
 	_tmp6_ = res;
 #line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp6_ != SQLITE_DONE) {
-#line 8363 "PhotoTable.c"
+#line 8367 "PhotoTable.c"
 		gint _tmp7_ = 0;
 #line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = res;
 #line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_fatal ("create PhotoBackingTable", _tmp7_);
-#line 8369 "PhotoTable.c"
+#line 8373 "PhotoTable.c"
 	}
 #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
 #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return self;
-#line 8375 "PhotoTable.c"
+#line 8379 "PhotoTable.c"
 }
 
 
 static BackingPhotoTable* backing_photo_table_new (void) {
 #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return backing_photo_table_construct (TYPE_BACKING_PHOTO_TABLE);
-#line 8382 "PhotoTable.c"
+#line 8386 "PhotoTable.c"
 }
 
 
@@ -8413,7 +8417,7 @@ BackingPhotoTable* backing_photo_table_get_instance (void) {
 	_tmp0_ = backing_photo_table_instance;
 #line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp0_ == NULL) {
-#line 8395 "PhotoTable.c"
+#line 8399 "PhotoTable.c"
 		BackingPhotoTable* _tmp1_ = NULL;
 #line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp1_ = backing_photo_table_new ();
@@ -8421,7 +8425,7 @@ BackingPhotoTable* backing_photo_table_get_instance (void) {
 		_database_table_unref0 (backing_photo_table_instance);
 #line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_table_instance = _tmp1_;
-#line 8403 "PhotoTable.c"
+#line 8407 "PhotoTable.c"
 	}
 #line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = backing_photo_table_instance;
@@ -8431,7 +8435,7 @@ BackingPhotoTable* backing_photo_table_get_instance (void) {
 	result = _tmp3_;
 #line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 8413 "PhotoTable.c"
+#line 8417 "PhotoTable.c"
 }
 
 
@@ -8649,7 +8653,7 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G
 	_tmp51_ = res;
 #line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp51_ != SQLITE_DONE) {
-#line 8631 "PhotoTable.c"
+#line 8635 "PhotoTable.c"
 		gint _tmp52_ = 0;
 #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp52_ = res;
@@ -8665,7 +8669,7 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G
 				_sqlite3_finalize0 (stmt);
 #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 8647 "PhotoTable.c"
+#line 8651 "PhotoTable.c"
 			} else {
 #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_sqlite3_finalize0 (stmt);
@@ -8675,7 +8679,7 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G
 				g_clear_error (&_inner_error_);
 #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 8657 "PhotoTable.c"
+#line 8661 "PhotoTable.c"
 			}
 		}
 	}
@@ -8695,7 +8699,7 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G
 	_tmp56_->time_created = _tmp57_;
 #line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 8677 "PhotoTable.c"
+#line 8681 "PhotoTable.c"
 }
 
 
@@ -8794,14 +8798,14 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot
 		_sqlite3_finalize0 (stmt);
 #line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 8775 "PhotoTable.c"
+#line 8779 "PhotoTable.c"
 	} else {
 		gint _tmp12_ = 0;
 #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 8782 "PhotoTable.c"
+#line 8786 "PhotoTable.c"
 			gint _tmp13_ = 0;
 #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp13_ = res;
@@ -8817,7 +8821,7 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot
 					_sqlite3_finalize0 (stmt);
 #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					return NULL;
-#line 8798 "PhotoTable.c"
+#line 8802 "PhotoTable.c"
 				} else {
 #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_sqlite3_finalize0 (stmt);
@@ -8827,7 +8831,7 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot
 					g_clear_error (&_inner_error_);
 #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					return NULL;
-#line 8808 "PhotoTable.c"
+#line 8812 "PhotoTable.c"
 				}
 			}
 		}
@@ -8914,7 +8918,7 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot
 	_sqlite3_finalize0 (stmt);
 #line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 8895 "PhotoTable.c"
+#line 8899 "PhotoTable.c"
 }
 
 
@@ -9102,7 +9106,7 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row,
 	_tmp45_ = res;
 #line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp45_ != SQLITE_DONE) {
-#line 9083 "PhotoTable.c"
+#line 9087 "PhotoTable.c"
 		gint _tmp46_ = 0;
 #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp46_ = res;
@@ -9118,7 +9122,7 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row,
 				_sqlite3_finalize0 (stmt);
 #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 9099 "PhotoTable.c"
+#line 9103 "PhotoTable.c"
 			} else {
 #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_sqlite3_finalize0 (stmt);
@@ -9128,13 +9132,13 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row,
 				g_clear_error (&_inner_error_);
 #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 9109 "PhotoTable.c"
+#line 9113 "PhotoTable.c"
 			}
 		}
 	}
 #line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 9115 "PhotoTable.c"
+#line 9119 "PhotoTable.c"
 }
 
 
@@ -9228,7 +9232,7 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot
 	_tmp19_ = res;
 #line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp19_ != SQLITE_DONE) {
-#line 9209 "PhotoTable.c"
+#line 9213 "PhotoTable.c"
 		gint _tmp20_ = 0;
 #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp20_ = res;
@@ -9244,7 +9248,7 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot
 				_sqlite3_finalize0 (stmt);
 #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 9225 "PhotoTable.c"
+#line 9229 "PhotoTable.c"
 			} else {
 #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_sqlite3_finalize0 (stmt);
@@ -9254,13 +9258,13 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot
 				g_clear_error (&_inner_error_);
 #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 9235 "PhotoTable.c"
+#line 9239 "PhotoTable.c"
 			}
 		}
 	}
 #line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 9241 "PhotoTable.c"
+#line 9245 "PhotoTable.c"
 }
 
 
@@ -9286,7 +9290,7 @@ void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backin
 			g_propagate_error (error, _inner_error_);
 #line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 9267 "PhotoTable.c"
+#line 9271 "PhotoTable.c"
 		} else {
 #line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.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);
@@ -9294,7 +9298,7 @@ void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backin
 			g_clear_error (&_inner_error_);
 #line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 9275 "PhotoTable.c"
+#line 9279 "PhotoTable.c"
 		}
 	}
 }
@@ -9327,7 +9331,7 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID*
 			g_propagate_error (error, _inner_error_);
 #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 9308 "PhotoTable.c"
+#line 9312 "PhotoTable.c"
 		} else {
 #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.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);
@@ -9335,7 +9339,7 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID*
 			g_clear_error (&_inner_error_);
 #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 9316 "PhotoTable.c"
+#line 9320 "PhotoTable.c"
 		}
 	}
 }
@@ -9366,7 +9370,7 @@ void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhoto
 			g_propagate_error (error, _inner_error_);
 #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 9347 "PhotoTable.c"
+#line 9351 "PhotoTable.c"
 		} else {
 #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.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);
@@ -9374,7 +9378,7 @@ void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhoto
 			g_clear_error (&_inner_error_);
 #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 9355 "PhotoTable.c"
+#line 9359 "PhotoTable.c"
 		}
 	}
 }
@@ -9385,7 +9389,7 @@ static void backing_photo_table_class_init (BackingPhotoTableClass * klass) {
 	backing_photo_table_parent_class = g_type_class_peek_parent (klass);
 #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	((DatabaseTableClass *) klass)->finalize = backing_photo_table_finalize;
-#line 9366 "PhotoTable.c"
+#line 9370 "PhotoTable.c"
 }
 
 
@@ -9399,7 +9403,7 @@ static void backing_photo_table_finalize (DatabaseTable* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_TABLE, BackingPhotoTable);
 #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	DATABASE_TABLE_CLASS (backing_photo_table_parent_class)->finalize (obj);
-#line 9380 "PhotoTable.c"
+#line 9384 "PhotoTable.c"
 }
 
 
diff --git a/src/db/SavedSearchDBTable.c b/src/db/SavedSearchDBTable.c
index f0c850f..14f8c4c 100644
--- a/src/db/SavedSearchDBTable.c
+++ b/src/db/SavedSearchDBTable.c
@@ -1,4 +1,4 @@
-/* SavedSearchDBTable.c generated by valac 0.34.4, the Vala compiler
+/* SavedSearchDBTable.c generated by valac 0.34.7, the Vala compiler
  * generated from SavedSearchDBTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1517,7 +1517,7 @@ SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar
 #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp34_ = _sc_list;
 #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-		_tmp35_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp35_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 		_tmp36_ = _tmp35_;
 #line 229 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -3127,7 +3127,7 @@ static GeeList* saved_search_db_table_get_conditions_for_id (SavedSearchDBTable*
 #line 405 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	g_return_val_if_fail (search_id != NULL, NULL);
 #line 407 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp0_ = gee_array_list_new (TYPE_SEARCH_CONDITION, (GBoxedCopyFunc) search_condition_ref, search_condition_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_SEARCH_CONDITION, (GBoxedCopyFunc) search_condition_ref, (GDestroyNotify) search_condition_unref, NULL, NULL, NULL);
 #line 407 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	list = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
 #line 412 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
@@ -4513,7 +4513,7 @@ GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError**
 #line 614 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
 #line 616 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
-	_tmp4_ = gee_array_list_new (TYPE_SAVED_SEARCH_ROW, (GBoxedCopyFunc) saved_search_row_ref, saved_search_row_unref, NULL, NULL, NULL);
+	_tmp4_ = gee_array_list_new (TYPE_SAVED_SEARCH_ROW, (GBoxedCopyFunc) saved_search_row_ref, (GDestroyNotify) saved_search_row_unref, NULL, NULL, NULL);
 #line 616 "/home/jens/Source/shotwell/src/db/SavedSearchDBTable.vala"
 	rows = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList);
 #line 4515 "SavedSearchDBTable.c"
diff --git a/src/db/TagTable.c b/src/db/TagTable.c
index 1e38ccd..e0aa0b1 100644
--- a/src/db/TagTable.c
+++ b/src/db/TagTable.c
@@ -1,4 +1,4 @@
-/* TagTable.c generated by valac 0.34.4, the Vala compiler
+/* TagTable.c generated by valac 0.34.7, the Vala compiler
  * generated from TagTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1577,7 +1577,7 @@ GeeList* tag_table_get_all_rows (TagTable* self, GError** error) {
 #line 163 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
 #line 165 "/home/jens/Source/shotwell/src/db/TagTable.vala"
-	_tmp4_ = gee_array_list_new (TYPE_TAG_ROW, (GBoxedCopyFunc) tag_row_ref, tag_row_unref, NULL, NULL, NULL);
+	_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"
@@ -2043,7 +2043,7 @@ static GeeSet* tag_table_unserialize_source_ids (TagTable* self, const gchar* te
 #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"
-	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 221 "/home/jens/Source/shotwell/src/db/TagTable.vala"
 	_result_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet);
 #line 223 "/home/jens/Source/shotwell/src/db/TagTable.vala"
diff --git a/src/db/TombstoneTable.c b/src/db/TombstoneTable.c
index 7829600..5897398 100644
--- a/src/db/TombstoneTable.c
+++ b/src/db/TombstoneTable.c
@@ -1,4 +1,4 @@
-/* TombstoneTable.c generated by valac 0.34.4, the Vala compiler
+/* TombstoneTable.c generated by valac 0.34.7, the Vala compiler
  * generated from TombstoneTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/VersionTable.c b/src/db/VersionTable.c
index 895d2ad..e678847 100644
--- a/src/db/VersionTable.c
+++ b/src/db/VersionTable.c
@@ -1,4 +1,4 @@
-/* VersionTable.c generated by valac 0.34.4, the Vala compiler
+/* VersionTable.c generated by valac 0.34.7, the Vala compiler
  * generated from VersionTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/VideoTable.c b/src/db/VideoTable.c
index 39adf72..da6cbc7 100644
--- a/src/db/VideoTable.c
+++ b/src/db/VideoTable.c
@@ -1,4 +1,4 @@
-/* VideoTable.c generated by valac 0.34.4, the Vala compiler
+/* VideoTable.c generated by valac 0.34.7, the Vala compiler
  * generated from VideoTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1660,7 +1660,7 @@ GeeArrayList* video_table_get_all (VideoTable* self) {
 #line 234 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
 #line 236 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp4_ = gee_array_list_new (TYPE_VIDEO_ROW, (GBoxedCopyFunc) video_row_ref, video_row_unref, NULL, NULL, NULL);
+	_tmp4_ = gee_array_list_new (TYPE_VIDEO_ROW, (GBoxedCopyFunc) video_row_ref, (GDestroyNotify) video_row_unref, NULL, NULL, NULL);
 #line 236 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	all = _tmp4_;
 #line 238 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
@@ -2680,7 +2680,7 @@ GeeArrayList* video_table_get_videos (VideoTable* self, GError** error) {
 #line 348 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
 #line 350 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp4_ = gee_array_list_new (TYPE_VIDEO_ID, (GBoxedCopyFunc) video_id_dup, video_id_free, NULL, NULL, NULL);
+	_tmp4_ = gee_array_list_new (TYPE_VIDEO_ID, (GBoxedCopyFunc) video_id_dup, (GDestroyNotify) video_id_free, NULL, NULL, NULL);
 #line 350 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	video_ids = _tmp4_;
 #line 2681 "VideoTable.c"
@@ -3211,7 +3211,7 @@ GeeArrayList* video_table_get_event_source_ids (VideoTable* self, EventID* event
 #line 439 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
 #line 441 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
-	_tmp9_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+	_tmp9_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 441 "/home/jens/Source/shotwell/src/db/VideoTable.vala"
 	_result_ = _tmp9_;
 #line 3212 "VideoTable.c"
diff --git a/src/direct/Direct.c b/src/direct/Direct.c
index 3f0abf5..1d5987d 100644
--- a/src/direct/Direct.c
+++ b/src/direct/Direct.c
@@ -1,4 +1,4 @@
-/* Direct.c generated by valac 0.34.4, the Vala compiler
+/* Direct.c generated by valac 0.34.7, the Vala compiler
  * generated from Direct.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/direct/DirectPhoto.c b/src/direct/DirectPhoto.c
index 369ddae..5347674 100644
--- a/src/direct/DirectPhoto.c
+++ b/src/direct/DirectPhoto.c
@@ -1,4 +1,4 @@
-/* DirectPhoto.c generated by valac 0.34.4, the Vala compiler
+/* DirectPhoto.c generated by valac 0.34.7, the Vala compiler
  * generated from DirectPhoto.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1825,33 +1825,33 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -2772,11 +2772,11 @@ 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 = 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 = 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 = direct_photo_source_collection_real_notify_items_removed;
+	((DataCollectionClass *) klass)->notify_items_removed = (void (*)(DataCollection*, GeeIterable*)) direct_photo_source_collection_real_notify_items_removed;
 #line 2781 "DirectPhoto.c"
 }
 
@@ -2787,11 +2787,11 @@ static void direct_photo_source_collection_instance_init (DirectPhotoSourceColle
 #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"
-	_tmp0_ = gee_array_list_new (TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 177 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self->priv->prepared_photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
-	_tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_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"
diff --git a/src/direct/DirectPhotoPage.c b/src/direct/DirectPhotoPage.c
index cc6e84e..6f15462 100644
--- a/src/direct/DirectPhotoPage.c
+++ b/src/direct/DirectPhotoPage.c
@@ -1,4 +1,4 @@
-/* DirectPhotoPage.c generated by valac 0.34.4, the Vala compiler
+/* DirectPhotoPage.c generated by valac 0.34.7, the Vala compiler
  * generated from DirectPhotoPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -3785,35 +3785,35 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -3910,7 +3910,7 @@ 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 = direct_fullscreen_photo_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) direct_fullscreen_photo_page_real_init_collect_ui_filenames;
 #line 3915 "DirectPhotoPage.c"
 }
 
diff --git a/src/direct/DirectView.c b/src/direct/DirectView.c
index f2ef1b1..da18fc5 100644
--- a/src/direct/DirectView.c
+++ b/src/direct/DirectView.c
@@ -1,4 +1,4 @@
-/* DirectView.c generated by valac 0.34.4, the Vala compiler
+/* DirectView.c generated by valac 0.34.7, the Vala compiler
  * generated from DirectView.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 06465a8..265200a 100644
--- a/src/direct/DirectWindow.c
+++ b/src/direct/DirectWindow.c
@@ -1,4 +1,4 @@
-/* DirectWindow.c generated by valac 0.34.4, the Vala compiler
+/* DirectWindow.c generated by valac 0.34.7, the Vala compiler
  * generated from DirectWindow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -12,10 +12,10 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gdk/gdk.h>
 #include <gio/gio.h>
 #include <gee.h>
 #include <glib/gi18n-lib.h>
-#include <gdk/gdk.h>
 
 
 #define TYPE_PAGE_WINDOW (page_window_get_type ())
@@ -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 = 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 = 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 = 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 = 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 = 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 = 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"
diff --git a/src/editing_tools/EditingTools.c b/src/editing_tools/EditingTools.c
index b9d37d7..b3bf03b 100644
--- a/src/editing_tools/EditingTools.c
+++ b/src/editing_tools/EditingTools.c
@@ -1,4 +1,4 @@
-/* EditingTools.c generated by valac 0.34.4, the Vala compiler
+/* EditingTools.c generated by valac 0.34.7, the Vala compiler
  * generated from EditingTools.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1928,13 +1928,13 @@ 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 = 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 = 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 = 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 = 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"
@@ -4260,7 +4260,7 @@ 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 = 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);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4907,25 +4907,25 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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);
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -12935,23 +12935,23 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = editing_tools_crop_tool_real_paint;
+	((EditingToolsEditingToolClass *) klass)->paint = (void (*)(EditingToolsEditingTool*, cairo_t*)) editing_tools_crop_tool_real_paint;
 #line 12956 "EditingTools.c"
 }
 
@@ -15053,21 +15053,21 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = editing_tools_redeye_tool_real_on_keypress;
+	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*)(EditingToolsEditingTool*, GdkEventKey*)) editing_tools_redeye_tool_real_on_keypress;
 #line 15072 "EditingTools.c"
 }
 
@@ -18932,11 +18932,11 @@ 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 = 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 = 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 = 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"
@@ -19258,13 +19258,13 @@ 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 = 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 = 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 = 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 = 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"
@@ -19525,11 +19525,11 @@ 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 = 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 = 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 = 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"
@@ -19581,17 +19581,17 @@ 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 = 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 = 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 = 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 = 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 = 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 = editing_tools_adjust_tool_real_on_keypress;
+	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*)(EditingToolsEditingTool*, GdkEventKey*)) editing_tools_adjust_tool_real_on_keypress;
 #line 19596 "EditingTools.c"
 }
 
diff --git a/src/editing_tools/StraightenTool.c b/src/editing_tools/StraightenTool.c
index 9ef9fef..a0de5bf 100644
--- a/src/editing_tools/StraightenTool.c
+++ b/src/editing_tools/StraightenTool.c
@@ -1,4 +1,4 @@
-/* StraightenTool.c generated by valac 0.34.4, the Vala compiler
+/* StraightenTool.c generated by valac 0.34.7, the Vala compiler
  * generated from StraightenTool.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -3510,21 +3510,21 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = editing_tools_straighten_tool_real_paint;
+	((EditingToolsEditingToolClass *) klass)->paint = (void (*)(EditingToolsEditingTool*, cairo_t*)) editing_tools_straighten_tool_real_paint;
 #line 3529 "StraightenTool.c"
 }
 
diff --git a/src/events/Branch.c b/src/events/Branch.c
index ac8b255..2320a00 100644
--- a/src/events/Branch.c
+++ b/src/events/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.4, the Vala compiler
+/* Branch.c generated by valac 0.34.7, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -3312,7 +3312,7 @@ static void events_branch_instance_init (EventsBranch * self) {
 #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"
-	_tmp0_ = gee_hash_map_new (TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, g_object_unref, EVENTS_TYPE_EVENT_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, EVENTS_TYPE_EVENT_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 18 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	self->priv->entry_map = _tmp0_;
 #line 20 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3444,7 +3444,7 @@ 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 = events_directory_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) events_directory_entry_real_get_sidebar_icon;
 #line 3449 "Branch.c"
 }
 
@@ -3550,11 +3550,11 @@ 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 = 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 = 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 = events_master_directory_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_master_directory_entry_real_create_page;
 #line 3559 "Branch.c"
 }
 
@@ -3675,9 +3675,9 @@ 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 = 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 = 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"
@@ -3833,9 +3833,9 @@ 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 = 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 = 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"
@@ -3931,9 +3931,9 @@ 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 = 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 = events_undated_directory_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_undated_directory_entry_real_create_page;
 #line 3938 "Branch.c"
 }
 
@@ -4142,7 +4142,7 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD
 #line 499 "/home/jens/Source/shotwell/src/events/Branch.vala"
 	g_return_val_if_fail (GEE_IS_LIST (media), FALSE);
 #line 502 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
@@ -4276,11 +4276,11 @@ 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 = 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 = 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 = 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"
@@ -4418,11 +4418,11 @@ 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 = 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 = 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 = events_no_event_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_no_event_entry_real_create_page;
 #line 4427 "Branch.c"
 }
 
diff --git a/src/events/EventDirectoryItem.c b/src/events/EventDirectoryItem.c
index 4f1606c..b32db57 100644
--- a/src/events/EventDirectoryItem.c
+++ b/src/events/EventDirectoryItem.c
@@ -1,4 +1,4 @@
-/* EventDirectoryItem.c generated by valac 0.34.4, the Vala compiler
+/* EventDirectoryItem.c generated by valac 0.34.7, the Vala compiler
  * generated from EventDirectoryItem.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1644,17 +1644,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 = 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 = 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 = 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 = 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 = 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 = 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"
diff --git a/src/events/EventPage.c b/src/events/EventPage.c
index 7d16d2a..23ca2e4 100644
--- a/src/events/EventPage.c
+++ b/src/events/EventPage.c
@@ -1,4 +1,4 @@
-/* EventPage.c generated by valac 0.34.4, the Vala compiler
+/* EventPage.c generated by valac 0.34.7, the Vala compiler
  * generated from EventPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -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 = 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"
 }
 
@@ -1817,9 +1817,9 @@ static void no_event_page_class_init (NoEventPageClass * klass) {
 #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 = 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 = 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"
diff --git a/src/events/Events.c b/src/events/Events.c
index 6c6dc44..97f36d8 100644
--- a/src/events/Events.c
+++ b/src/events/Events.c
@@ -1,4 +1,4 @@
-/* Events.c generated by valac 0.34.4, the Vala compiler
+/* Events.c generated by valac 0.34.7, 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 c31c92e..7617f27 100644
--- a/src/events/EventsDirectoryPage.c
+++ b/src/events/EventsDirectoryPage.c
@@ -1,4 +1,4 @@
-/* EventsDirectoryPage.c generated by valac 0.34.4, the Vala compiler
+/* EventsDirectoryPage.c generated by valac 0.34.7, the Vala compiler
  * generated from EventsDirectoryPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2241,7 +2241,7 @@ 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 = events_directory_page_event_directory_manager_real_create_view;
+	((ViewManagerClass *) klass)->create_view = (DataView* (*)(ViewManager*, DataSource*)) events_directory_page_event_directory_manager_real_create_view;
 #line 2246 "EventsDirectoryPage.c"
 }
 
@@ -2438,9 +2438,9 @@ 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 = 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 = events_directory_page_events_directory_search_view_filter_real_predicate;
+	((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) events_directory_page_events_directory_search_view_filter_real_predicate;
 #line 2445 "EventsDirectoryPage.c"
 }
 
@@ -2467,23 +2467,23 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -3017,7 +3017,7 @@ 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 = sub_events_directory_page_sub_event_directory_manager_real_include_in_view;
+	((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) sub_events_directory_page_sub_event_directory_manager_real_include_in_view;
 #line 3022 "EventsDirectoryPage.c"
 }
 
diff --git a/src/folders/Branch.c b/src/folders/Branch.c
index f5962f6..5f20e23 100644
--- a/src/folders/Branch.c
+++ b/src/folders/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.4, the Vala compiler
+/* Branch.c generated by valac 0.34.7, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -998,7 +998,7 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
 #line 73 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	file = _tmp1_;
 #line 75 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	_tmp2_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp2_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 75 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	elements = _tmp2_;
 #line 78 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1076,7 +1076,7 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
 #line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp16_ = elements;
 #line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		_tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp18_ = _tmp17_;
 #line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
@@ -1497,7 +1497,7 @@ static void folders_branch_instance_init (FoldersBranch * self) {
 #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"
-	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, FOLDERS_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, FOLDERS_TYPE_SIDEBAR_ENTRY, (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/folders/Branch.vala"
 	self->priv->entries = _tmp0_;
 #line 1504 "Branch.c"
@@ -1968,13 +1968,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 = 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 = 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 = 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 = 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"
diff --git a/src/folders/Folders.c b/src/folders/Folders.c
index ab4c085..cae90dc 100644
--- a/src/folders/Folders.c
+++ b/src/folders/Folders.c
@@ -1,4 +1,4 @@
-/* Folders.c generated by valac 0.34.4, the Vala compiler
+/* Folders.c generated by valac 0.34.7, the Vala compiler
  * generated from Folders.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/folders/Page.c b/src/folders/Page.c
index c451234..3c05b3e 100644
--- a/src/folders/Page.c
+++ b/src/folders/Page.c
@@ -1,4 +1,4 @@
-/* Page.c generated by valac 0.34.4, the Vala compiler
+/* Page.c generated by valac 0.34.7, the Vala compiler
  * generated from Page.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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"
 }
 
@@ -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 = 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 = 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"
diff --git a/src/library/Branch.c b/src/library/Branch.c
index be0fedc..9a3d452 100644
--- a/src/library/Branch.c
+++ b/src/library/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.4, the Vala compiler
+/* Branch.c generated by valac 0.34.7, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1767,11 +1767,11 @@ 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 = 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 = 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 = library_photos_entry_real_create_page;
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_photos_entry_real_create_page;
 #line 1776 "Branch.c"
 }
 
@@ -2116,9 +2116,9 @@ 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 = 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 = library_main_page_real_set_config_photos_sort;
+	((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) library_main_page_real_set_config_photos_sort;
 #line 2123 "Branch.c"
 }
 
diff --git a/src/library/FlaggedPage.c b/src/library/FlaggedPage.c
index 09dafd0..849e784 100644
--- a/src/library/FlaggedPage.c
+++ b/src/library/FlaggedPage.c
@@ -1,4 +1,4 @@
-/* FlaggedPage.c generated by valac 0.34.4, the Vala compiler
+/* FlaggedPage.c generated by valac 0.34.7, the Vala compiler
  * generated from FlaggedPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 = 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 = 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 = 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 = 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"
diff --git a/src/library/FlaggedSidebarEntry.c b/src/library/FlaggedSidebarEntry.c
index 5ed7427..38df252 100644
--- a/src/library/FlaggedSidebarEntry.c
+++ b/src/library/FlaggedSidebarEntry.c
@@ -1,4 +1,4 @@
-/* FlaggedSidebarEntry.c generated by valac 0.34.4, the Vala compiler
+/* FlaggedSidebarEntry.c generated by valac 0.34.7, the Vala compiler
  * generated from FlaggedSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 = 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 = 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"
diff --git a/src/library/ImportQueuePage.c b/src/library/ImportQueuePage.c
index b64083a..a2794b7 100644
--- a/src/library/ImportQueuePage.c
+++ b/src/library/ImportQueuePage.c
@@ -1,4 +1,4 @@
-/* ImportQueuePage.c generated by valac 0.34.4, the Vala compiler
+/* ImportQueuePage.c generated by valac 0.34.7, the Vala compiler
  * generated from ImportQueuePage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -845,7 +845,7 @@ void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport*
 #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp15_ = self->priv->queue;
 #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp17_ = _tmp16_;
 #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -874,7 +874,7 @@ gint import_queue_page_get_batch_count (ImportQueuePage* self) {
 #line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = self->priv->queue;
 #line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp2_ = _tmp1_;
 #line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -907,7 +907,7 @@ static void import_queue_page_update_stop_action (ImportQueuePage* self) {
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp4_ = self->priv->queue;
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp6_ = _tmp5_;
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -944,7 +944,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 #line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = self->priv->queue;
 #line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp2_ = _tmp1_;
 #line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -982,7 +982,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp7_ = _batch_import_list;
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp9_ = _tmp8_;
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1317,7 +1317,7 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm
 #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp2_ = self->priv->queue;
 #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp4_ = _tmp3_;
 #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1391,7 +1391,7 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm
 #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp27_ = self->priv->queue;
 #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp29_ = _tmp28_;
 #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1481,11 +1481,11 @@ 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 = 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 = 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 = 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"
@@ -1503,11 +1503,11 @@ static void import_queue_page_instance_init (ImportQueuePage * self) {
 #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"
-	_tmp0_ = gee_array_list_new (TYPE_BATCH_IMPORT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_BATCH_IMPORT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 10 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self->priv->queue = _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp1_ = gee_hash_set_new (TYPE_BATCH_IMPORT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp1_ = gee_hash_set_new (TYPE_BATCH_IMPORT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 11 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self->priv->cancel_unallowed = _tmp1_;
 #line 12 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
diff --git a/src/library/ImportQueueSidebarEntry.c b/src/library/ImportQueueSidebarEntry.c
index fb038d9..cd17564 100644
--- a/src/library/ImportQueueSidebarEntry.c
+++ b/src/library/ImportQueueSidebarEntry.c
@@ -1,4 +1,4 @@
-/* ImportQueueSidebarEntry.c generated by valac 0.34.4, the Vala compiler
+/* ImportQueueSidebarEntry.c generated by valac 0.34.7, the Vala compiler
  * generated from ImportQueueSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 = 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 = 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 bfaa3ed..41a084f 100644
--- a/src/library/LastImportPage.c
+++ b/src/library/LastImportPage.c
@@ -1,4 +1,4 @@
-/* LastImportPage.c generated by valac 0.34.4, the Vala compiler
+/* LastImportPage.c generated by valac 0.34.7, the Vala compiler
  * generated from LastImportPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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"
 }
 
@@ -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 = 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 = 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"
diff --git a/src/library/LastImportSidebarEntry.c b/src/library/LastImportSidebarEntry.c
index d30c4af..5032c53 100644
--- a/src/library/LastImportSidebarEntry.c
+++ b/src/library/LastImportSidebarEntry.c
@@ -1,4 +1,4 @@
-/* LastImportSidebarEntry.c generated by valac 0.34.4, the Vala compiler
+/* LastImportSidebarEntry.c generated by valac 0.34.7, the Vala compiler
  * generated from LastImportSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 = 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 = 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"
diff --git a/src/library/Library.c b/src/library/Library.c
index 0e29d27..bb7907e 100644
--- a/src/library/Library.c
+++ b/src/library/Library.c
@@ -1,4 +1,4 @@
-/* Library.c generated by valac 0.34.4, the Vala compiler
+/* Library.c generated by valac 0.34.7, the Vala compiler
  * generated from Library.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c
index e304171..526b38f 100644
--- a/src/library/LibraryWindow.c
+++ b/src/library/LibraryWindow.c
@@ -1,4 +1,4 @@
-/* LibraryWindow.c generated by valac 0.34.4, the Vala compiler
+/* LibraryWindow.c generated by valac 0.34.7, the Vala compiler
  * generated from LibraryWindow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -13,8 +13,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <gee.h>
-#include <gio/gio.h>
 #include <gdk/gdk.h>
+#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 #include <gphoto2/gphoto2-camera.h>
 #include <gphoto.h>
@@ -4395,7 +4395,7 @@ static void library_window_on_empty_trash (LibraryWindow* self) {
 #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"
-	_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	to_remove = _tmp0_;
 #line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5596,7 +5596,7 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 #line 5596 "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, batch_import_job_unref, NULL, NULL, NULL);
+	_tmp18_ = 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_;
 #line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5687,7 +5687,7 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 #line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = 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_COLLECTION, GeeCollection));
+	_tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp35_ = _tmp34_;
 #line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9257,11 +9257,11 @@ 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 = 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 = 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 = 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"
@@ -9310,35 +9310,35 @@ static void library_window_class_init (LibraryWindowClass * 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
 	G_OBJECT_CLASS (klass)->finalize = library_window_finalize;
 #line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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"
@@ -9423,7 +9423,7 @@ static void library_window_instance_init (LibraryWindow * self) {
 #line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->page_switching_enabled = TRUE;
 #line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = gee_hash_map_new (TYPE_PAGE, (GBoxedCopyFunc) g_object_ref, g_object_unref, SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp11_ = gee_hash_map_new (TYPE_PAGE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->page_map = _tmp11_;
 #line 118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
diff --git a/src/library/OfflinePage.c b/src/library/OfflinePage.c
index 1117bcd..f789adf 100644
--- a/src/library/OfflinePage.c
+++ b/src/library/OfflinePage.c
@@ -1,4 +1,4 @@
-/* OfflinePage.c generated by valac 0.34.4, the Vala compiler
+/* OfflinePage.c generated by valac 0.34.7, the Vala compiler
  * generated from OfflinePage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1404,11 +1404,11 @@ static void offline_page_on_remove_from_library (OfflinePage* self) {
 #line 1405 "OfflinePage.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp23_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp23_ = 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_;
 #line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp24_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp24_ = 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_;
 #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1617,7 +1617,7 @@ 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 = offline_page_offline_search_view_filter_real_get_criteria;
+	((SearchViewFilterClass *) klass)->get_criteria = (guint (*)(SearchViewFilter*)) offline_page_offline_search_view_filter_real_get_criteria;
 #line 1622 "OfflinePage.c"
 }
 
@@ -1644,17 +1644,17 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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"
diff --git a/src/library/OfflineSidebarEntry.c b/src/library/OfflineSidebarEntry.c
index 1a19cd3..215616d 100644
--- a/src/library/OfflineSidebarEntry.c
+++ b/src/library/OfflineSidebarEntry.c
@@ -1,4 +1,4 @@
-/* OfflineSidebarEntry.c generated by valac 0.34.4, the Vala compiler
+/* OfflineSidebarEntry.c generated by valac 0.34.7, the Vala compiler
  * generated from OfflineSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 = 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 = 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"
diff --git a/src/library/TrashPage.c b/src/library/TrashPage.c
index c108bba..b323541 100644
--- a/src/library/TrashPage.c
+++ b/src/library/TrashPage.c
@@ -1,4 +1,4 @@
-/* TrashPage.c generated by valac 0.34.4, the Vala compiler
+/* TrashPage.c generated by valac 0.34.7, the Vala compiler
  * generated from TrashPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1550,7 +1550,7 @@ 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 = trash_page_trash_search_view_filter_real_get_criteria;
+	((SearchViewFilterClass *) klass)->get_criteria = (guint (*)(SearchViewFilter*)) trash_page_trash_search_view_filter_real_get_criteria;
 #line 1555 "TrashPage.c"
 }
 
@@ -1577,19 +1577,19 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
diff --git a/src/library/TrashSidebarEntry.c b/src/library/TrashSidebarEntry.c
index 0eca1b9..8e620d7 100644
--- a/src/library/TrashSidebarEntry.c
+++ b/src/library/TrashSidebarEntry.c
@@ -1,4 +1,4 @@
-/* TrashSidebarEntry.c generated by valac 0.34.4, the Vala compiler
+/* TrashSidebarEntry.c generated by valac 0.34.7, the Vala compiler
  * generated from TrashSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 = 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 = 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"
diff --git a/src/main.c b/src/main.c
index 0b93c0c..01325d7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,4 @@
-/* main.c generated by valac 0.34.4, the Vala compiler
+/* main.c generated by valac 0.34.7, the Vala compiler
  * generated from main.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1753,7 +1753,7 @@ void run_system_pictures_import (ImportManifest* external_exclusion_manifest) {
 #line 1746 "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, batch_import_job_unref, NULL, NULL, NULL);
+	_tmp1_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
 #line 218 "/home/jens/Source/shotwell/src/main.vala"
 	jobs = _tmp1_;
 #line 219 "/home/jens/Source/shotwell/src/main.vala"
diff --git a/src/photos/BmpSupport.c b/src/photos/BmpSupport.c
index ae80b52..2425607 100644
--- a/src/photos/BmpSupport.c
+++ b/src/photos/BmpSupport.c
@@ -1,4 +1,4 @@
-/* BmpSupport.c generated by valac 0.34.4, the Vala compiler
+/* BmpSupport.c generated by valac 0.34.7, the Vala compiler
  * generated from BmpSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -888,19 +888,19 @@ static void photos_bmp_file_format_properties_class_init (PhotosBmpFileFormatPro
 #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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -986,12 +986,12 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
 	GFile* _tmp0_ = NULL;
 	GFileInputStream* _tmp1_ = NULL;
 	guint8* file_lead_sequence = NULL;
-	guint8* _tmp2_ = NULL;
+	guint8* _tmp3_ = NULL;
 	gint file_lead_sequence_length1 = 0;
 	gint _file_lead_sequence_size_ = 0;
-	GFileInputStream* _tmp3_ = NULL;
-	guint8* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
+	GFileInputStream* _tmp4_ = NULL;
+	guint8* _tmp5_ = NULL;
+	gint _tmp5__length1 = 0;
 	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,30 +1003,34 @@ 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"
+		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 FALSE;
-#line 1011 "BmpSupport.c"
+		return _tmp2_;
+#line 1013 "BmpSupport.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp2_ = g_new0 (guint8, G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE));
+	_tmp3_ = g_new0 (guint8, G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE));
 #line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	file_lead_sequence = _tmp2_;
+	file_lead_sequence = _tmp3_;
 #line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	file_lead_sequence_length1 = G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE);
 #line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_file_lead_sequence_size_ = file_lead_sequence_length1;
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp3_ = instream;
+	_tmp4_ = instream;
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp4_ = file_lead_sequence;
+	_tmp5_ = file_lead_sequence;
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp4__length1 = file_lead_sequence_length1;
+	_tmp5__length1 = file_lead_sequence_length1;
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_input_stream_get_type (), GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_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"
+		gboolean _tmp6_ = FALSE;
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1034,62 +1038,62 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_g_object_unref0 (instream);
 #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-		return FALSE;
-#line 1039 "BmpSupport.c"
+		return _tmp6_;
+#line 1043 "BmpSupport.c"
 	}
 	{
 		gint i = 0;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		i = 0;
-#line 1045 "BmpSupport.c"
+#line 1049 "BmpSupport.c"
 		{
-			gboolean _tmp5_ = FALSE;
+			gboolean _tmp7_ = FALSE;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-			_tmp5_ = TRUE;
+			_tmp7_ = TRUE;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 			while (TRUE) {
-#line 1052 "BmpSupport.c"
-				gint _tmp7_ = 0;
-				guint8* _tmp8_ = NULL;
-				gint _tmp8__length1 = 0;
+#line 1056 "BmpSupport.c"
 				gint _tmp9_ = 0;
-				guint8 _tmp10_ = 0U;
+				guint8* _tmp10_ = NULL;
+				gint _tmp10__length1 = 0;
 				gint _tmp11_ = 0;
 				guint8 _tmp12_ = 0U;
+				gint _tmp13_ = 0;
+				guint8 _tmp14_ = 0U;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				if (!_tmp5_) {
-#line 1062 "BmpSupport.c"
-					gint _tmp6_ = 0;
+				if (!_tmp7_) {
+#line 1066 "BmpSupport.c"
+					gint _tmp8_ = 0;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-					_tmp6_ = i;
+					_tmp8_ = i;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-					i = _tmp6_ + 1;
-#line 1068 "BmpSupport.c"
+					i = _tmp8_ + 1;
+#line 1072 "BmpSupport.c"
 				}
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				_tmp5_ = FALSE;
+				_tmp7_ = FALSE;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				_tmp7_ = i;
+				_tmp9_ = i;
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				if (!(_tmp7_ < G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE))) {
+				if (!(_tmp9_ < G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE))) {
 #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 					break;
-#line 1078 "BmpSupport.c"
+#line 1082 "BmpSupport.c"
 				}
 #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				_tmp8_ = file_lead_sequence;
+				_tmp10_ = file_lead_sequence;
 #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				_tmp8__length1 = file_lead_sequence_length1;
+				_tmp10__length1 = file_lead_sequence_length1;
 #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				_tmp9_ = i;
+				_tmp11_ = i;
 #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				_tmp10_ = _tmp8_[_tmp9_];
+				_tmp12_ = _tmp10_[_tmp11_];
 #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				_tmp11_ = i;
+				_tmp13_ = i;
 #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				_tmp12_ = PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE[_tmp11_];
+				_tmp14_ = PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE[_tmp13_];
 #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-				if (_tmp10_ != _tmp12_) {
+				if (_tmp12_ != _tmp14_) {
 #line 68 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 					result = FALSE;
 #line 68 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1098,7 +1102,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 1102 "BmpSupport.c"
+#line 1106 "BmpSupport.c"
 				}
 			}
 		}
@@ -1111,14 +1115,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 1115 "BmpSupport.c"
+#line 1119 "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 1122 "BmpSupport.c"
+#line 1126 "BmpSupport.c"
 }
 
 
@@ -1154,7 +1158,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 1158 "BmpSupport.c"
+#line 1162 "BmpSupport.c"
 	}
 #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	if (!_tmp0_) {
@@ -1164,11 +1168,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 1168 "BmpSupport.c"
+#line 1172 "BmpSupport.c"
 		}
 #line 79 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		return result;
-#line 1172 "BmpSupport.c"
+#line 1176 "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_);
@@ -1182,7 +1186,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 1186 "BmpSupport.c"
+#line 1190 "BmpSupport.c"
 	}
 #line 82 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp5_ = detected;
@@ -1196,11 +1200,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 1200 "BmpSupport.c"
+#line 1204 "BmpSupport.c"
 		}
 #line 83 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		return result;
-#line 1204 "BmpSupport.c"
+#line 1208 "BmpSupport.c"
 	}
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp7_ = detected;
@@ -1208,17 +1212,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 1212 "BmpSupport.c"
+#line 1216 "BmpSupport.c"
 		DetectedPhotoInformation* _tmp9_ = NULL;
 #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 1218 "BmpSupport.c"
+#line 1222 "BmpSupport.c"
 	} else {
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp6_ = NULL;
-#line 1222 "BmpSupport.c"
+#line 1226 "BmpSupport.c"
 	}
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp10_ = _detected_photo_information_ref0 (_tmp6_);
@@ -1230,11 +1234,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 1234 "BmpSupport.c"
+#line 1238 "BmpSupport.c"
 	}
 #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1238 "BmpSupport.c"
+#line 1242 "BmpSupport.c"
 }
 
 
@@ -1242,8 +1246,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 = photos_bmp_sniffer_real_sniff;
-#line 1247 "BmpSupport.c"
+	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) photos_bmp_sniffer_real_sniff;
+#line 1251 "BmpSupport.c"
 }
 
 
@@ -1274,14 +1278,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 1278 "BmpSupport.c"
+#line 1282 "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 1285 "BmpSupport.c"
+#line 1289 "BmpSupport.c"
 }
 
 
@@ -1310,7 +1314,7 @@ 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 1314 "BmpSupport.c"
+#line 1318 "BmpSupport.c"
 	} else {
 		Dimensions _tmp4_ = {0};
 		gint _tmp5_ = 0;
@@ -1320,11 +1324,11 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
 		_tmp5_ = _tmp4_.height;
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp1_ = _tmp5_ > 9999;
-#line 1324 "BmpSupport.c"
+#line 1328 "BmpSupport.c"
 	}
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	if (_tmp1_) {
-#line 1328 "BmpSupport.c"
+#line 1332 "BmpSupport.c"
 		gboolean _tmp6_ = FALSE;
 		Dimensions _tmp7_ = {0};
 		gint _tmp8_ = 0;
@@ -1336,7 +1340,7 @@ 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 1340 "BmpSupport.c"
+#line 1344 "BmpSupport.c"
 		} else {
 			Dimensions _tmp9_ = {0};
 			gint _tmp10_ = 0;
@@ -1346,19 +1350,19 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
 			_tmp10_ = _tmp9_.height;
 #line 105 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 			_tmp6_ = _tmp10_ < 100;
-#line 1350 "BmpSupport.c"
+#line 1354 "BmpSupport.c"
 		}
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp0_ = _tmp6_;
-#line 1354 "BmpSupport.c"
+#line 1358 "BmpSupport.c"
 	} else {
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp0_ = FALSE;
-#line 1358 "BmpSupport.c"
+#line 1362 "BmpSupport.c"
 	}
 #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	if (_tmp0_) {
-#line 1362 "BmpSupport.c"
+#line 1366 "BmpSupport.c"
 		Dimensions prefetch_dimensions = {0};
 		Dimensions _tmp11_ = {0};
 		GdkPixbuf* _tmp12_ = NULL;
@@ -1409,7 +1413,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 1413 "BmpSupport.c"
+#line 1417 "BmpSupport.c"
 		}
 #line 109 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp21_ = _tmp12_;
@@ -1437,7 +1441,7 @@ 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 1441 "BmpSupport.c"
+#line 1445 "BmpSupport.c"
 	} else {
 		GdkPixbuf* _tmp28_ = NULL;
 		gchar* _tmp29_ = NULL;
@@ -1477,7 +1481,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 1481 "BmpSupport.c"
+#line 1485 "BmpSupport.c"
 		}
 #line 114 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 		_tmp37_ = _tmp28_;
@@ -1489,13 +1493,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 1493 "BmpSupport.c"
+#line 1497 "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 1499 "BmpSupport.c"
+#line 1503 "BmpSupport.c"
 }
 
 
@@ -1503,8 +1507,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 = photos_bmp_reader_real_scaled_read;
-#line 1508 "BmpSupport.c"
+	((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) photos_bmp_reader_real_scaled_read;
+#line 1512 "BmpSupport.c"
 }
 
 
@@ -1535,14 +1539,14 @@ 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 1539 "BmpSupport.c"
+#line 1543 "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 1546 "BmpSupport.c"
+#line 1550 "BmpSupport.c"
 }
 
 
@@ -1572,7 +1576,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 1576 "BmpSupport.c"
+#line 1580 "BmpSupport.c"
 	}
 }
 
@@ -1581,8 +1585,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 = photos_bmp_writer_real_write;
-#line 1586 "BmpSupport.c"
+	((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) photos_bmp_writer_real_write;
+#line 1590 "BmpSupport.c"
 }
 
 
@@ -1613,14 +1617,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 1617 "BmpSupport.c"
+#line 1621 "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 1624 "BmpSupport.c"
+#line 1628 "BmpSupport.c"
 }
 
 
@@ -1630,7 +1634,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 1634 "BmpSupport.c"
+#line 1638 "BmpSupport.c"
 }
 
 
@@ -1638,8 +1642,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 = photos_bmp_metadata_writer_real_write_metadata;
-#line 1643 "BmpSupport.c"
+	((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) photos_bmp_metadata_writer_real_write_metadata;
+#line 1647 "BmpSupport.c"
 }
 
 
@@ -1669,14 +1673,14 @@ 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 1673 "BmpSupport.c"
+#line 1677 "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 1680 "BmpSupport.c"
+#line 1684 "BmpSupport.c"
 }
 
 
@@ -1692,7 +1696,7 @@ PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_get_instance (void) {
 	result = _tmp1_;
 #line 151 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	return result;
-#line 1696 "BmpSupport.c"
+#line 1700 "BmpSupport.c"
 }
 
 
@@ -1708,7 +1712,7 @@ 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 1712 "BmpSupport.c"
+#line 1716 "BmpSupport.c"
 }
 
 
@@ -1729,7 +1733,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 1733 "BmpSupport.c"
+#line 1737 "BmpSupport.c"
 }
 
 
@@ -1742,7 +1746,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 1746 "BmpSupport.c"
+#line 1750 "BmpSupport.c"
 }
 
 
@@ -1755,7 +1759,7 @@ 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 1759 "BmpSupport.c"
+#line 1763 "BmpSupport.c"
 }
 
 
@@ -1776,7 +1780,7 @@ 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 1780 "BmpSupport.c"
+#line 1784 "BmpSupport.c"
 }
 
 
@@ -1797,7 +1801,7 @@ 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 1801 "BmpSupport.c"
+#line 1805 "BmpSupport.c"
 }
 
 
@@ -1821,7 +1825,7 @@ 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 1825 "BmpSupport.c"
+#line 1829 "BmpSupport.c"
 }
 
 
@@ -1837,7 +1841,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 1841 "BmpSupport.c"
+#line 1845 "BmpSupport.c"
 }
 
 
@@ -1847,14 +1851,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 1851 "BmpSupport.c"
+#line 1855 "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 1858 "BmpSupport.c"
+#line 1862 "BmpSupport.c"
 }
 
 
@@ -1864,22 +1868,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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = photos_bmp_file_format_driver_real_create_metadata;
-#line 1883 "BmpSupport.c"
+	((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) photos_bmp_file_format_driver_real_create_metadata;
+#line 1887 "BmpSupport.c"
 }
 
 
@@ -1893,7 +1897,7 @@ static void photos_bmp_file_format_driver_finalize (PhotoFileFormatDriver* obj)
 	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 1897 "BmpSupport.c"
+#line 1901 "BmpSupport.c"
 }
 
 
diff --git a/src/photos/GRaw.c b/src/photos/GRaw.c
index 12ffba3..27a2ffb 100644
--- a/src/photos/GRaw.c
+++ b/src/photos/GRaw.c
@@ -1,4 +1,4 @@
-/* GRaw.c generated by valac 0.34.4, the Vala compiler
+/* GRaw.c generated by valac 0.34.7, the Vala compiler
  * generated from GRaw.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1095,14 +1095,12 @@ static libraw_imgother_t libraw_get_image_other (libraw_data_t* self) {
 	libraw_imgother_t result = {0};
 	libraw_imgother_t _tmp0_ = {0};
 #line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	g_return_val_if_fail (self != NULL, result);
-#line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	_tmp0_ = self->other;
 #line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	result = _tmp0_;
 #line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	return result;
-#line 1106 "GRaw.c"
+#line 1104 "GRaw.c"
 }
 
 
@@ -1110,8 +1108,6 @@ 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};
-#line 171 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
 #line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
 #line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1120,7 +1116,7 @@ libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self) {
 	result = _tmp1_;
 #line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1124 "GRaw.c"
+#line 1120 "GRaw.c"
 }
 
 
@@ -1128,14 +1124,12 @@ static libraw_iparams_t libraw_get_image_params (libraw_data_t* self) {
 	libraw_iparams_t result = {0};
 	libraw_iparams_t _tmp0_ = {0};
 #line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	g_return_val_if_fail (self != NULL, result);
-#line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	_tmp0_ = self->idata;
 #line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	result = _tmp0_;
 #line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	return result;
-#line 1139 "GRaw.c"
+#line 1133 "GRaw.c"
 }
 
 
@@ -1143,8 +1137,6 @@ 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};
-#line 175 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
 #line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
 #line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1153,7 +1145,7 @@ libraw_iparams_t graw_processor_get_image_params (GRawProcessor* self) {
 	result = _tmp1_;
 #line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1157 "GRaw.c"
+#line 1149 "GRaw.c"
 }
 
 
@@ -1161,14 +1153,12 @@ static libraw_image_sizes_t libraw_get_sizes (libraw_data_t* self) {
 	libraw_image_sizes_t result = {0};
 	libraw_image_sizes_t _tmp0_ = {0};
 #line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	g_return_val_if_fail (self != NULL, result);
-#line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	_tmp0_ = self->sizes;
 #line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	result = _tmp0_;
 #line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	return result;
-#line 1172 "GRaw.c"
+#line 1162 "GRaw.c"
 }
 
 
@@ -1176,8 +1166,6 @@ 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};
-#line 179 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
 #line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
 #line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1186,7 +1174,7 @@ libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self) {
 	result = _tmp1_;
 #line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1190 "GRaw.c"
+#line 1178 "GRaw.c"
 }
 
 
@@ -1194,14 +1182,12 @@ static libraw_thumbnail_t libraw_get_thumbnail (libraw_data_t* self) {
 	libraw_thumbnail_t result = {0};
 	libraw_thumbnail_t _tmp0_ = {0};
 #line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	g_return_val_if_fail (self != NULL, result);
-#line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	_tmp0_ = self->thumbnail;
 #line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	result = _tmp0_;
 #line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	return result;
-#line 1205 "GRaw.c"
+#line 1191 "GRaw.c"
 }
 
 
@@ -1209,8 +1195,6 @@ libraw_thumbnail_t graw_processor_get_thumbnail (GRawProcessor* self) {
 	libraw_thumbnail_t result = {0};
 	libraw_data_t* _tmp0_ = NULL;
 	libraw_thumbnail_t _tmp1_ = {0};
-#line 183 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
 #line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
 #line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1219,7 +1203,7 @@ libraw_thumbnail_t graw_processor_get_thumbnail (GRawProcessor* self) {
 	result = _tmp1_;
 #line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1223 "GRaw.c"
+#line 1207 "GRaw.c"
 }
 
 
@@ -1246,7 +1230,7 @@ GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError**
 			g_propagate_error (error, _inner_error_);
 #line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 1250 "GRaw.c"
+#line 1234 "GRaw.c"
 		} else {
 #line 188 "/home/jens/Source/shotwell/src/photos/GRaw.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);
@@ -1254,7 +1238,7 @@ GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError**
 			g_clear_error (&_inner_error_);
 #line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 1258 "GRaw.c"
+#line 1242 "GRaw.c"
 		}
 	}
 #line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1267,7 +1251,7 @@ GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError**
 	_graw_processed_image_unref0 (_tmp0_);
 #line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1271 "GRaw.c"
+#line 1255 "GRaw.c"
 }
 
 
@@ -1294,7 +1278,7 @@ GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError
 			g_propagate_error (error, _inner_error_);
 #line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 1298 "GRaw.c"
+#line 1282 "GRaw.c"
 		} else {
 #line 192 "/home/jens/Source/shotwell/src/photos/GRaw.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);
@@ -1302,7 +1286,7 @@ GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError
 			g_clear_error (&_inner_error_);
 #line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 1306 "GRaw.c"
+#line 1290 "GRaw.c"
 		}
 	}
 #line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1315,7 +1299,7 @@ GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError
 	_graw_processed_image_unref0 (_tmp0_);
 #line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1319 "GRaw.c"
+#line 1303 "GRaw.c"
 }
 
 
@@ -1345,7 +1329,7 @@ void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer
 			g_propagate_error (error, _inner_error_);
 #line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1349 "GRaw.c"
+#line 1333 "GRaw.c"
 		} else {
 #line 196 "/home/jens/Source/shotwell/src/photos/GRaw.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);
@@ -1353,7 +1337,7 @@ void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer
 			g_clear_error (&_inner_error_);
 #line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1357 "GRaw.c"
+#line 1341 "GRaw.c"
 		}
 	}
 }
@@ -1384,7 +1368,7 @@ void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GErro
 			g_propagate_error (error, _inner_error_);
 #line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1388 "GRaw.c"
+#line 1372 "GRaw.c"
 		} else {
 #line 200 "/home/jens/Source/shotwell/src/photos/GRaw.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);
@@ -1392,7 +1376,7 @@ void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GErro
 			g_clear_error (&_inner_error_);
 #line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1396 "GRaw.c"
+#line 1380 "GRaw.c"
 		}
 	}
 }
@@ -1418,7 +1402,7 @@ void graw_processor_process (GRawProcessor* self, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1422 "GRaw.c"
+#line 1406 "GRaw.c"
 		} else {
 #line 204 "/home/jens/Source/shotwell/src/photos/GRaw.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);
@@ -1426,7 +1410,7 @@ void graw_processor_process (GRawProcessor* self, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1430 "GRaw.c"
+#line 1414 "GRaw.c"
 		}
 	}
 }
@@ -1457,7 +1441,7 @@ void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename,
 			g_propagate_error (error, _inner_error_);
 #line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1461 "GRaw.c"
+#line 1445 "GRaw.c"
 		} else {
 #line 208 "/home/jens/Source/shotwell/src/photos/GRaw.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);
@@ -1465,7 +1449,7 @@ void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename,
 			g_clear_error (&_inner_error_);
 #line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1469 "GRaw.c"
+#line 1453 "GRaw.c"
 		}
 	}
 }
@@ -1496,7 +1480,7 @@ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GE
 			g_propagate_error (error, _inner_error_);
 #line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1500 "GRaw.c"
+#line 1484 "GRaw.c"
 		} else {
 #line 212 "/home/jens/Source/shotwell/src/photos/GRaw.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);
@@ -1504,7 +1488,7 @@ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GE
 			g_clear_error (&_inner_error_);
 #line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1508 "GRaw.c"
+#line 1492 "GRaw.c"
 		}
 	}
 }
@@ -1518,7 +1502,7 @@ void graw_processor_recycle (GRawProcessor* self) {
 	_tmp0_ = self->priv->proc;
 #line 216 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	libraw_recycle (_tmp0_);
-#line 1522 "GRaw.c"
+#line 1506 "GRaw.c"
 }
 
 
@@ -1542,7 +1526,7 @@ void graw_processor_unpack (GRawProcessor* self, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1546 "GRaw.c"
+#line 1530 "GRaw.c"
 		} else {
 #line 220 "/home/jens/Source/shotwell/src/photos/GRaw.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);
@@ -1550,7 +1534,7 @@ void graw_processor_unpack (GRawProcessor* self, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1554 "GRaw.c"
+#line 1538 "GRaw.c"
 		}
 	}
 }
@@ -1576,7 +1560,7 @@ void graw_processor_unpack_thumb (GRawProcessor* self, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1580 "GRaw.c"
+#line 1564 "GRaw.c"
 		} else {
 #line 224 "/home/jens/Source/shotwell/src/photos/GRaw.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);
@@ -1584,7 +1568,7 @@ void graw_processor_unpack_thumb (GRawProcessor* self, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1588 "GRaw.c"
+#line 1572 "GRaw.c"
 		}
 	}
 }
@@ -1613,7 +1597,7 @@ static void lib_raw_output_params_set_chromatic_aberrations (libraw_output_param
 	(*_tmp3_).aber[2] = _tmp4_;
 #line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	_tmp5_ = (*_tmp3_).aber[2];
-#line 1617 "GRaw.c"
+#line 1601 "GRaw.c"
 }
 
 
@@ -1640,7 +1624,7 @@ static void lib_raw_output_params_set_gamma_curve (libraw_output_params_t* param
 	(*_tmp3_).gamm[1] = _tmp4_;
 #line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	_tmp5_ = (*_tmp3_).gamm[1];
-#line 1644 "GRaw.c"
+#line 1628 "GRaw.c"
 }
 
 
@@ -1770,7 +1754,7 @@ void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean hal
 	_tmp30_ = _tmp29_;
 #line 262 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp30_).use_fuji_rotate = (gint) GRAW_FUJI_ROTATE_USE;
-#line 1774 "GRaw.c"
+#line 1758 "GRaw.c"
 }
 
 
@@ -1785,14 +1769,14 @@ libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self) {
 	result = &_tmp0_->params;
 #line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1789 "GRaw.c"
+#line 1773 "GRaw.c"
 }
 
 
 static void graw_value_processor_init (GValue* value) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	value->data[0].v_pointer = NULL;
-#line 1796 "GRaw.c"
+#line 1780 "GRaw.c"
 }
 
 
@@ -1801,7 +1785,7 @@ static void graw_value_processor_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processor_unref (value->data[0].v_pointer);
-#line 1805 "GRaw.c"
+#line 1789 "GRaw.c"
 	}
 }
 
@@ -1811,11 +1795,11 @@ static void graw_value_processor_copy_value (const GValue* src_value, GValue* de
 	if (src_value->data[0].v_pointer) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		dest_value->data[0].v_pointer = graw_processor_ref (src_value->data[0].v_pointer);
-#line 1815 "GRaw.c"
+#line 1799 "GRaw.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1819 "GRaw.c"
+#line 1803 "GRaw.c"
 	}
 }
 
@@ -1823,37 +1807,37 @@ static void graw_value_processor_copy_value (const GValue* src_value, GValue* de
 static gpointer graw_value_processor_peek_pointer (const GValue* value) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return value->data[0].v_pointer;
-#line 1827 "GRaw.c"
+#line 1811 "GRaw.c"
 }
 
 
 static gchar* graw_value_processor_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (collect_values[0].v_pointer) {
-#line 1834 "GRaw.c"
+#line 1818 "GRaw.c"
 		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) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1841 "GRaw.c"
+#line 1825 "GRaw.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.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 1845 "GRaw.c"
+#line 1829 "GRaw.c"
 		}
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = graw_processor_ref (object);
-#line 1849 "GRaw.c"
+#line 1833 "GRaw.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = NULL;
-#line 1853 "GRaw.c"
+#line 1837 "GRaw.c"
 	}
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return NULL;
-#line 1857 "GRaw.c"
+#line 1841 "GRaw.c"
 }
 
 
@@ -1864,25 +1848,25 @@ static gchar* graw_value_processor_lcopy_value (const GValue* value, guint n_col
 	if (!object_p) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1868 "GRaw.c"
+#line 1852 "GRaw.c"
 	}
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (!value->data[0].v_pointer) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		*object_p = NULL;
-#line 1874 "GRaw.c"
+#line 1858 "GRaw.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1878 "GRaw.c"
+#line 1862 "GRaw.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		*object_p = graw_processor_ref (value->data[0].v_pointer);
-#line 1882 "GRaw.c"
+#line 1866 "GRaw.c"
 	}
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return NULL;
-#line 1886 "GRaw.c"
+#line 1870 "GRaw.c"
 }
 
 
@@ -1896,7 +1880,7 @@ GParamSpec* graw_param_spec_processor (const gchar* name, const gchar* nick, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return G_PARAM_SPEC (spec);
-#line 1900 "GRaw.c"
+#line 1884 "GRaw.c"
 }
 
 
@@ -1905,7 +1889,7 @@ gpointer graw_value_get_processor (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR), NULL);
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return value->data[0].v_pointer;
-#line 1909 "GRaw.c"
+#line 1893 "GRaw.c"
 }
 
 
@@ -1925,17 +1909,17 @@ void graw_value_set_processor (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processor_ref (value->data[0].v_pointer);
-#line 1929 "GRaw.c"
+#line 1913 "GRaw.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = NULL;
-#line 1933 "GRaw.c"
+#line 1917 "GRaw.c"
 	}
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (old) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processor_unref (old);
-#line 1939 "GRaw.c"
+#line 1923 "GRaw.c"
 	}
 }
 
@@ -1954,17 +1938,17 @@ void graw_value_take_processor (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = v_object;
-#line 1958 "GRaw.c"
+#line 1942 "GRaw.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = NULL;
-#line 1962 "GRaw.c"
+#line 1946 "GRaw.c"
 	}
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (old) {
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processor_unref (old);
-#line 1968 "GRaw.c"
+#line 1952 "GRaw.c"
 	}
 }
 
@@ -1976,7 +1960,7 @@ static void graw_processor_class_init (GRawProcessorClass * klass) {
 	((GRawProcessorClass *) klass)->finalize = graw_processor_finalize;
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_type_class_add_private (klass, sizeof (GRawProcessorPrivate));
-#line 1980 "GRaw.c"
+#line 1964 "GRaw.c"
 }
 
 
@@ -1985,7 +1969,7 @@ static void graw_processor_instance_init (GRawProcessor * self) {
 	self->priv = GRAW_PROCESSOR_GET_PRIVATE (self);
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self->ref_count = 1;
-#line 1989 "GRaw.c"
+#line 1973 "GRaw.c"
 }
 
 
@@ -1997,7 +1981,7 @@ static void graw_processor_finalize (GRawProcessor* obj) {
 	g_signal_handlers_destroy (self);
 #line 161 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_libraw_close0 (self->priv->proc);
-#line 2001 "GRaw.c"
+#line 1985 "GRaw.c"
 }
 
 
@@ -2022,7 +2006,7 @@ gpointer graw_processor_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return instance;
-#line 2026 "GRaw.c"
+#line 2010 "GRaw.c"
 }
 
 
@@ -2035,7 +2019,7 @@ void graw_processor_unref (gpointer instance) {
 		GRAW_PROCESSOR_GET_CLASS (self)->finalize (self);
 #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2039 "GRaw.c"
+#line 2023 "GRaw.c"
 	}
 }
 
@@ -2057,14 +2041,14 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 	if (_tmp0_ == LIBRAW_SUCCESS) {
 #line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		return;
-#line 2061 "GRaw.c"
+#line 2045 "GRaw.c"
 	} else {
 		enum LibRaw_errors _tmp1_ = 0;
 #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 2068 "GRaw.c"
+#line 2052 "GRaw.c"
 			const gchar* _tmp2_ = NULL;
 			enum LibRaw_errors _tmp3_ = 0;
 			enum LibRaw_errors _tmp4_ = 0;
@@ -2088,7 +2072,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_propagate_error (error, _inner_error_);
 #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2092 "GRaw.c"
+#line 2076 "GRaw.c"
 			} else {
 #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.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);
@@ -2096,7 +2080,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2100 "GRaw.c"
+#line 2084 "GRaw.c"
 			}
 		}
 	}
@@ -2116,7 +2100,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 	switch (_tmp11_) {
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_UNSPECIFIED_ERROR:
-#line 2120 "GRaw.c"
+#line 2104 "GRaw.c"
 		{
 			const gchar* _tmp12_ = NULL;
 			GError* _tmp13_ = NULL;
@@ -2134,7 +2118,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2138 "GRaw.c"
+#line 2122 "GRaw.c"
 			} else {
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2144,12 +2128,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2148 "GRaw.c"
+#line 2132 "GRaw.c"
 			}
 		}
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_FILE_UNSUPPORTED:
-#line 2153 "GRaw.c"
+#line 2137 "GRaw.c"
 		{
 			const gchar* _tmp14_ = NULL;
 			GError* _tmp15_ = NULL;
@@ -2167,7 +2151,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2171 "GRaw.c"
+#line 2155 "GRaw.c"
 			} else {
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2177,12 +2161,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2181 "GRaw.c"
+#line 2165 "GRaw.c"
 			}
 		}
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_REQUEST_FOR_NONEXISTENT_IMAGE:
-#line 2186 "GRaw.c"
+#line 2170 "GRaw.c"
 		{
 			const gchar* _tmp16_ = NULL;
 			GError* _tmp17_ = NULL;
@@ -2200,7 +2184,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2204 "GRaw.c"
+#line 2188 "GRaw.c"
 			} else {
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2210,12 +2194,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2214 "GRaw.c"
+#line 2198 "GRaw.c"
 			}
 		}
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_OUT_OF_ORDER_CALL:
-#line 2219 "GRaw.c"
+#line 2203 "GRaw.c"
 		{
 			const gchar* _tmp18_ = NULL;
 			GError* _tmp19_ = NULL;
@@ -2233,7 +2217,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2237 "GRaw.c"
+#line 2221 "GRaw.c"
 			} else {
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2243,12 +2227,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2247 "GRaw.c"
+#line 2231 "GRaw.c"
 			}
 		}
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_NO_THUMBNAIL:
-#line 2252 "GRaw.c"
+#line 2236 "GRaw.c"
 		{
 			const gchar* _tmp20_ = NULL;
 			GError* _tmp21_ = NULL;
@@ -2266,7 +2250,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2270 "GRaw.c"
+#line 2254 "GRaw.c"
 			} else {
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2276,12 +2260,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2280 "GRaw.c"
+#line 2264 "GRaw.c"
 			}
 		}
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_UNSUPPORTED_THUMBNAIL:
-#line 2285 "GRaw.c"
+#line 2269 "GRaw.c"
 		{
 			const gchar* _tmp22_ = NULL;
 			GError* _tmp23_ = NULL;
@@ -2299,7 +2283,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2303 "GRaw.c"
+#line 2287 "GRaw.c"
 			} else {
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2309,12 +2293,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2313 "GRaw.c"
+#line 2297 "GRaw.c"
 			}
 		}
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_UNSUFFICIENT_MEMORY:
-#line 2318 "GRaw.c"
+#line 2302 "GRaw.c"
 		{
 			const gchar* _tmp24_ = NULL;
 			GError* _tmp25_ = NULL;
@@ -2332,7 +2316,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2336 "GRaw.c"
+#line 2320 "GRaw.c"
 			} else {
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2342,12 +2326,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2346 "GRaw.c"
+#line 2330 "GRaw.c"
 			}
 		}
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_DATA_ERROR:
-#line 2351 "GRaw.c"
+#line 2335 "GRaw.c"
 		{
 			const gchar* _tmp26_ = NULL;
 			GError* _tmp27_ = NULL;
@@ -2365,7 +2349,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2369 "GRaw.c"
+#line 2353 "GRaw.c"
 			} else {
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2375,12 +2359,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2379 "GRaw.c"
+#line 2363 "GRaw.c"
 			}
 		}
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_IO_ERROR:
-#line 2384 "GRaw.c"
+#line 2368 "GRaw.c"
 		{
 			const gchar* _tmp28_ = NULL;
 			GError* _tmp29_ = NULL;
@@ -2398,7 +2382,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2402 "GRaw.c"
+#line 2386 "GRaw.c"
 			} else {
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2408,12 +2392,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2412 "GRaw.c"
+#line 2396 "GRaw.c"
 			}
 		}
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_CANCELLED_BY_CALLBACK:
-#line 2417 "GRaw.c"
+#line 2401 "GRaw.c"
 		{
 			const gchar* _tmp30_ = NULL;
 			GError* _tmp31_ = NULL;
@@ -2431,7 +2415,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2435 "GRaw.c"
+#line 2419 "GRaw.c"
 			} else {
 #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2441,12 +2425,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2445 "GRaw.c"
+#line 2429 "GRaw.c"
 			}
 		}
 #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_BAD_CROP:
-#line 2450 "GRaw.c"
+#line 2434 "GRaw.c"
 		{
 			const gchar* _tmp32_ = NULL;
 			GError* _tmp33_ = NULL;
@@ -2464,7 +2448,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2468 "GRaw.c"
+#line 2452 "GRaw.c"
 			} else {
 #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2474,7 +2458,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2478 "GRaw.c"
+#line 2462 "GRaw.c"
 			}
 		}
 		default:
@@ -2483,12 +2467,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 			_g_free0 (msg);
 #line 309 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 2487 "GRaw.c"
+#line 2471 "GRaw.c"
 		}
 	}
 #line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_g_free0 (msg);
-#line 2492 "GRaw.c"
+#line 2476 "GRaw.c"
 }
 
 
diff --git a/src/photos/GdkSupport.c b/src/photos/GdkSupport.c
index b9e36c1..1fb61f7 100644
--- a/src/photos/GdkSupport.c
+++ b/src/photos/GdkSupport.c
@@ -1,4 +1,4 @@
-/* GdkSupport.c generated by valac 0.34.4, the Vala compiler
+/* GdkSupport.c generated by valac 0.34.7, the Vala compiler
  * generated from GdkSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 = 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 = gdk_reader_real_scaled_read;
+	((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) gdk_reader_real_scaled_read;
 #line 471 "GdkSupport.c"
 }
 
@@ -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 = gdk_sniffer_real_sniff;
+	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) gdk_sniffer_real_sniff;
 #line 1362 "GdkSupport.c"
 }
 
diff --git a/src/photos/JfifSupport.c b/src/photos/JfifSupport.c
index 113c56c..1891b36 100644
--- a/src/photos/JfifSupport.c
+++ b/src/photos/JfifSupport.c
@@ -1,4 +1,4 @@
-/* JfifSupport.c generated by valac 0.34.4, the Vala compiler
+/* JfifSupport.c generated by valac 0.34.7, the Vala compiler
  * generated from JfifSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
 }
 
@@ -1136,19 +1136,19 @@ static void jfif_file_format_properties_class_init (JfifFileFormatPropertiesClas
 #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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -1363,7 +1363,7 @@ 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 = jfif_sniffer_real_sniff;
+	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) jfif_sniffer_real_sniff;
 #line 1368 "JfifSupport.c"
 }
 
@@ -1497,7 +1497,7 @@ 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 = jfif_writer_real_write;
+	((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) jfif_writer_real_write;
 #line 1502 "JfifSupport.c"
 }
 
@@ -1575,7 +1575,7 @@ 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 = jfif_metadata_writer_real_write_metadata;
+	((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) jfif_metadata_writer_real_write_metadata;
 #line 1580 "JfifSupport.c"
 }
 
@@ -1776,11 +1776,11 @@ gboolean jpeg_is_jpeg (GFile* file, GError** error) {
 	GFileInputStream* _tmp1_ = NULL;
 	JpegMarker marker = 0;
 	gint segment_length = 0;
-	GFileInputStream* _tmp2_ = NULL;
-	JpegMarker _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gboolean _tmp5_ = FALSE;
-	JpegMarker _tmp6_ = 0;
+	GFileInputStream* _tmp3_ = NULL;
+	JpegMarker _tmp4_ = 0;
+	gint _tmp5_ = 0;
+	gboolean _tmp7_ = FALSE;
+	JpegMarker _tmp8_ = 0;
 	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,53 +1792,57 @@ 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"
+		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 FALSE;
-#line 1800 "JfifSupport.c"
+		return _tmp2_;
+#line 1802 "JfifSupport.c"
 	}
 #line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp2_ = fins;
+	_tmp3_ = fins;
 #line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp4_ = jpeg_read_marker (_tmp2_, &_tmp3_, &_inner_error_);
+	_tmp5_ = jpeg_read_marker (_tmp3_, &_tmp4_, &_inner_error_);
 #line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	marker = _tmp3_;
+	marker = _tmp4_;
 #line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	segment_length = _tmp4_;
+	segment_length = _tmp5_;
 #line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1814 "JfifSupport.c"
+		gboolean _tmp6_ = FALSE;
 #line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_g_object_unref0 (fins);
 #line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-		return FALSE;
-#line 1818 "JfifSupport.c"
+		return _tmp6_;
+#line 1822 "JfifSupport.c"
 	}
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp6_ = marker;
+	_tmp8_ = marker;
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	if (_tmp6_ == JPEG_MARKER_SOI) {
-#line 1824 "JfifSupport.c"
-		gint _tmp7_ = 0;
+	if (_tmp8_ == JPEG_MARKER_SOI) {
+#line 1828 "JfifSupport.c"
+		gint _tmp9_ = 0;
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-		_tmp7_ = segment_length;
+		_tmp9_ = segment_length;
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-		_tmp5_ = _tmp7_ == 0;
-#line 1830 "JfifSupport.c"
+		_tmp7_ = _tmp9_ == 0;
+#line 1834 "JfifSupport.c"
 	} else {
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-		_tmp5_ = FALSE;
-#line 1834 "JfifSupport.c"
+		_tmp7_ = FALSE;
+#line 1838 "JfifSupport.c"
 	}
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	result = _tmp5_;
+	result = _tmp7_;
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_g_object_unref0 (fins);
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1842 "JfifSupport.c"
+#line 1846 "JfifSupport.c"
 }
 
 
@@ -1852,16 +1856,16 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
 	guint8 _tmp3_ = 0U;
 	GDataInputStream* _tmp4_ = NULL;
 	guint8 _tmp5_ = 0U;
-	guint8 _tmp6_ = 0U;
-	GDataInputStream* _tmp7_ = NULL;
-	guint8 _tmp8_ = 0U;
-	gboolean _tmp9_ = FALSE;
-	JpegMarker _tmp10_ = 0;
+	guint8 _tmp7_ = 0U;
+	GDataInputStream* _tmp8_ = NULL;
+	guint8 _tmp9_ = 0U;
+	gboolean _tmp11_ = FALSE;
+	JpegMarker _tmp12_ = 0;
 	guint16 length = 0U;
-	GDataInputStream* _tmp12_ = NULL;
-	guint16 _tmp13_ = 0U;
-	guint16 _tmp14_ = 0U;
-	guint16 _tmp18_ = 0U;
+	GDataInputStream* _tmp14_ = NULL;
+	guint16 _tmp15_ = 0U;
+	guint16 _tmp17_ = 0U;
+	guint16 _tmp21_ = 0U;
 	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);
@@ -1885,13 +1889,15 @@ 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"
+		gint _tmp6_ = 0;
 #line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_g_object_unref0 (dins);
 #line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-		return 0;
-#line 1895 "JfifSupport.c"
+		return _tmp6_;
+#line 1901 "JfifSupport.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (_tmp3_ != JPEG_MARKER_PREFIX) {
@@ -1903,47 +1909,49 @@ 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 1907 "JfifSupport.c"
+#line 1913 "JfifSupport.c"
 		}
 #line 220 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return result;
-#line 1911 "JfifSupport.c"
+#line 1917 "JfifSupport.c"
 	}
 #line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp7_ = dins;
+	_tmp8_ = dins;
 #line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp8_ = g_data_input_stream_read_byte (_tmp7_, NULL, &_inner_error_);
+	_tmp9_ = g_data_input_stream_read_byte (_tmp8_, NULL, &_inner_error_);
 #line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp6_ = _tmp8_;
+	_tmp7_ = _tmp9_;
 #line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1927 "JfifSupport.c"
+		gint _tmp10_ = 0;
 #line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_g_object_unref0 (dins);
 #line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-		return 0;
-#line 1927 "JfifSupport.c"
+		return _tmp10_;
+#line 1935 "JfifSupport.c"
 	}
 #line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_vala_marker = (JpegMarker) _tmp6_;
+	_vala_marker = (JpegMarker) _tmp7_;
 #line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp10_ = _vala_marker;
+	_tmp12_ = _vala_marker;
 #line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	if (_tmp10_ == JPEG_MARKER_SOI) {
+	if (_tmp12_ == JPEG_MARKER_SOI) {
 #line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-		_tmp9_ = TRUE;
-#line 1937 "JfifSupport.c"
+		_tmp11_ = TRUE;
+#line 1945 "JfifSupport.c"
 	} else {
-		JpegMarker _tmp11_ = 0;
+		JpegMarker _tmp13_ = 0;
 #line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-		_tmp11_ = _vala_marker;
+		_tmp13_ = _vala_marker;
 #line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-		_tmp9_ = _tmp11_ == JPEG_MARKER_EOI;
-#line 1944 "JfifSupport.c"
+		_tmp11_ = _tmp13_ == JPEG_MARKER_EOI;
+#line 1952 "JfifSupport.c"
 	}
 #line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	if (_tmp9_) {
+	if (_tmp11_) {
 #line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		result = 0;
 #line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -1952,44 +1960,46 @@ 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 1956 "JfifSupport.c"
+#line 1964 "JfifSupport.c"
 		}
 #line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return result;
-#line 1960 "JfifSupport.c"
+#line 1968 "JfifSupport.c"
 	}
 #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp12_ = dins;
+	_tmp14_ = dins;
 #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp13_ = g_data_input_stream_read_uint16 (_tmp12_, NULL, &_inner_error_);
+	_tmp15_ = g_data_input_stream_read_uint16 (_tmp14_, NULL, &_inner_error_);
 #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	length = _tmp13_;
+	length = _tmp15_;
 #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1978 "JfifSupport.c"
+		gint _tmp16_ = 0;
 #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_g_object_unref0 (dins);
 #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-		return 0;
-#line 1976 "JfifSupport.c"
+		return _tmp16_;
+#line 1986 "JfifSupport.c"
 	}
 #line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp14_ = length;
+	_tmp17_ = length;
 #line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	if (((gint) _tmp14_) < 2) {
-#line 1982 "JfifSupport.c"
-		guint16 _tmp15_ = 0U;
-		GFileInputStream* _tmp16_ = NULL;
-		gint64 _tmp17_ = 0LL;
+	if (((gint) _tmp17_) < 2) {
+#line 1992 "JfifSupport.c"
+		guint16 _tmp18_ = 0U;
+		GFileInputStream* _tmp19_ = NULL;
+		gint64 _tmp20_ = 0LL;
 #line 230 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-		_tmp15_ = length;
+		_tmp18_ = length;
 #line 230 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-		_tmp16_ = fins;
+		_tmp19_ = fins;
 #line 230 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-		_tmp17_ = G_FILE_INPUT_STREAM_GET_CLASS (_tmp16_)->tell (_tmp16_);
+		_tmp20_ = G_FILE_INPUT_STREAM_GET_CLASS (_tmp19_)->tell (_tmp19_);
 #line 230 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-		g_debug ("Invalid length %Xh at ofs %" G_GINT64_FORMAT "Xh", _tmp15_, _tmp17_ - 2);
+		g_debug ("Invalid length %Xh at ofs %" G_GINT64_FORMAT "Xh", _tmp18_, _tmp20_ - 2);
 #line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		result = -1;
 #line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -1998,27 +2008,27 @@ 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 2002 "JfifSupport.c"
+#line 2012 "JfifSupport.c"
 		}
 #line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return result;
-#line 2006 "JfifSupport.c"
+#line 2016 "JfifSupport.c"
 	}
 #line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp18_ = length;
+	_tmp21_ = length;
 #line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	result = _tmp18_ - 2;
+	result = _tmp21_ - 2;
 #line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_g_object_unref0 (dins);
 #line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (marker) {
 #line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		*marker = _vala_marker;
-#line 2018 "JfifSupport.c"
+#line 2028 "JfifSupport.c"
 	}
 #line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 2022 "JfifSupport.c"
+#line 2032 "JfifSupport.c"
 }
 
 
diff --git a/src/photos/PhotoFileAdapter.c b/src/photos/PhotoFileAdapter.c
index 89b0e25..a2fb384 100644
--- a/src/photos/PhotoFileAdapter.c
+++ b/src/photos/PhotoFileAdapter.c
@@ -1,4 +1,4 @@
-/* PhotoFileAdapter.c generated by valac 0.34.4, the Vala compiler
+/* PhotoFileAdapter.c generated by valac 0.34.7, the Vala compiler
  * generated from PhotoFileAdapter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 = 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 = 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"
 }
 
@@ -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 = photo_file_writer_real_write;
+	((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) photo_file_writer_real_write;
 #line 1069 "PhotoFileAdapter.c"
 }
 
@@ -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 = 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 24f6bd3..f34e451 100644
--- a/src/photos/PhotoFileFormat.c
+++ b/src/photos/PhotoFileFormat.c
@@ -1,4 +1,4 @@
-/* PhotoFileFormat.c generated by valac 0.34.4, the Vala compiler
+/* PhotoFileFormat.c generated by valac 0.34.7, the Vala compiler
  * generated from PhotoFileFormat.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2319,11 +2319,12 @@ PhotoMetadata* photo_file_format_driver_create_metadata (PhotoFileFormatDriver*
 
 
 static gboolean photo_file_format_driver_real_can_write_image (PhotoFileFormatDriver* self) {
+	gboolean _tmp0_ = FALSE;
 #line 351 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_can_write_image'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 351 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	return FALSE;
-#line 2327 "PhotoFileFormat.c"
+	return _tmp0_;
+#line 2328 "PhotoFileFormat.c"
 }
 
 
@@ -2332,16 +2333,17 @@ gboolean photo_file_format_driver_can_write_image (PhotoFileFormatDriver* self)
 	g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), FALSE);
 #line 351 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->can_write_image (self);
-#line 2336 "PhotoFileFormat.c"
+#line 2337 "PhotoFileFormat.c"
 }
 
 
 static gboolean photo_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* self) {
+	gboolean _tmp0_ = FALSE;
 #line 353 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_can_write_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 353 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	return FALSE;
-#line 2345 "PhotoFileFormat.c"
+	return _tmp0_;
+#line 2347 "PhotoFileFormat.c"
 }
 
 
@@ -2350,7 +2352,7 @@ gboolean photo_file_format_driver_can_write_metadata (PhotoFileFormatDriver* sel
 	g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), FALSE);
 #line 353 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->can_write_metadata (self);
-#line 2354 "PhotoFileFormat.c"
+#line 2356 "PhotoFileFormat.c"
 }
 
 
@@ -2359,7 +2361,7 @@ static PhotoFileWriter* photo_file_format_driver_real_create_writer (PhotoFileFo
 	g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_create_writer'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 355 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return NULL;
-#line 2363 "PhotoFileFormat.c"
+#line 2365 "PhotoFileFormat.c"
 }
 
 
@@ -2368,7 +2370,7 @@ PhotoFileWriter* photo_file_format_driver_create_writer (PhotoFileFormatDriver*
 	g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), NULL);
 #line 355 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->create_writer (self, filepath);
-#line 2372 "PhotoFileFormat.c"
+#line 2374 "PhotoFileFormat.c"
 }
 
 
@@ -2377,7 +2379,7 @@ static PhotoFileMetadataWriter* photo_file_format_driver_real_create_metadata_wr
 	g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_create_metadata_writer'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 357 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return NULL;
-#line 2381 "PhotoFileFormat.c"
+#line 2383 "PhotoFileFormat.c"
 }
 
 
@@ -2386,7 +2388,7 @@ PhotoFileMetadataWriter* photo_file_format_driver_create_metadata_writer (PhotoF
 	g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), NULL);
 #line 357 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->create_metadata_writer (self, filepath);
-#line 2390 "PhotoFileFormat.c"
+#line 2392 "PhotoFileFormat.c"
 }
 
 
@@ -2395,7 +2397,7 @@ static PhotoFileSniffer* photo_file_format_driver_real_create_sniffer (PhotoFile
 	g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_create_sniffer'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 359 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return NULL;
-#line 2399 "PhotoFileFormat.c"
+#line 2401 "PhotoFileFormat.c"
 }
 
 
@@ -2404,7 +2406,7 @@ PhotoFileSniffer* photo_file_format_driver_create_sniffer (PhotoFileFormatDriver
 	g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), NULL);
 #line 359 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->create_sniffer (self, file, options);
-#line 2408 "PhotoFileFormat.c"
+#line 2410 "PhotoFileFormat.c"
 }
 
 
@@ -2414,14 +2416,14 @@ PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type) {
 	self = (PhotoFileFormatDriver*) g_type_create_instance (object_type);
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return self;
-#line 2418 "PhotoFileFormat.c"
+#line 2420 "PhotoFileFormat.c"
 }
 
 
 static void value_photo_file_format_driver_init (GValue* value) {
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	value->data[0].v_pointer = NULL;
-#line 2425 "PhotoFileFormat.c"
+#line 2427 "PhotoFileFormat.c"
 }
 
 
@@ -2430,7 +2432,7 @@ static void value_photo_file_format_driver_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		photo_file_format_driver_unref (value->data[0].v_pointer);
-#line 2434 "PhotoFileFormat.c"
+#line 2436 "PhotoFileFormat.c"
 	}
 }
 
@@ -2440,11 +2442,11 @@ static void value_photo_file_format_driver_copy_value (const GValue* src_value,
 	if (src_value->data[0].v_pointer) {
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		dest_value->data[0].v_pointer = photo_file_format_driver_ref (src_value->data[0].v_pointer);
-#line 2444 "PhotoFileFormat.c"
+#line 2446 "PhotoFileFormat.c"
 	} else {
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2448 "PhotoFileFormat.c"
+#line 2450 "PhotoFileFormat.c"
 	}
 }
 
@@ -2452,37 +2454,37 @@ static void value_photo_file_format_driver_copy_value (const GValue* src_value,
 static gpointer value_photo_file_format_driver_peek_pointer (const GValue* value) {
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return value->data[0].v_pointer;
-#line 2456 "PhotoFileFormat.c"
+#line 2458 "PhotoFileFormat.c"
 }
 
 
 static gchar* value_photo_file_format_driver_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (collect_values[0].v_pointer) {
-#line 2463 "PhotoFileFormat.c"
+#line 2465 "PhotoFileFormat.c"
 		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) {
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2470 "PhotoFileFormat.c"
+#line 2472 "PhotoFileFormat.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.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 2474 "PhotoFileFormat.c"
+#line 2476 "PhotoFileFormat.c"
 		}
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		value->data[0].v_pointer = photo_file_format_driver_ref (object);
-#line 2478 "PhotoFileFormat.c"
+#line 2480 "PhotoFileFormat.c"
 	} else {
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		value->data[0].v_pointer = NULL;
-#line 2482 "PhotoFileFormat.c"
+#line 2484 "PhotoFileFormat.c"
 	}
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return NULL;
-#line 2486 "PhotoFileFormat.c"
+#line 2488 "PhotoFileFormat.c"
 }
 
 
@@ -2493,25 +2495,25 @@ static gchar* value_photo_file_format_driver_lcopy_value (const GValue* value, g
 	if (!object_p) {
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2497 "PhotoFileFormat.c"
+#line 2499 "PhotoFileFormat.c"
 	}
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (!value->data[0].v_pointer) {
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		*object_p = NULL;
-#line 2503 "PhotoFileFormat.c"
+#line 2505 "PhotoFileFormat.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2507 "PhotoFileFormat.c"
+#line 2509 "PhotoFileFormat.c"
 	} else {
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		*object_p = photo_file_format_driver_ref (value->data[0].v_pointer);
-#line 2511 "PhotoFileFormat.c"
+#line 2513 "PhotoFileFormat.c"
 	}
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return NULL;
-#line 2515 "PhotoFileFormat.c"
+#line 2517 "PhotoFileFormat.c"
 }
 
 
@@ -2525,7 +2527,7 @@ GParamSpec* param_spec_photo_file_format_driver (const gchar* name, const gchar*
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return G_PARAM_SPEC (spec);
-#line 2529 "PhotoFileFormat.c"
+#line 2531 "PhotoFileFormat.c"
 }
 
 
@@ -2534,7 +2536,7 @@ gpointer value_get_photo_file_format_driver (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_DRIVER), NULL);
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return value->data[0].v_pointer;
-#line 2538 "PhotoFileFormat.c"
+#line 2540 "PhotoFileFormat.c"
 }
 
 
@@ -2554,17 +2556,17 @@ void value_set_photo_file_format_driver (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		photo_file_format_driver_ref (value->data[0].v_pointer);
-#line 2558 "PhotoFileFormat.c"
+#line 2560 "PhotoFileFormat.c"
 	} else {
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		value->data[0].v_pointer = NULL;
-#line 2562 "PhotoFileFormat.c"
+#line 2564 "PhotoFileFormat.c"
 	}
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (old) {
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		photo_file_format_driver_unref (old);
-#line 2568 "PhotoFileFormat.c"
+#line 2570 "PhotoFileFormat.c"
 	}
 }
 
@@ -2583,17 +2585,17 @@ void value_take_photo_file_format_driver (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		value->data[0].v_pointer = v_object;
-#line 2587 "PhotoFileFormat.c"
+#line 2589 "PhotoFileFormat.c"
 	} else {
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		value->data[0].v_pointer = NULL;
-#line 2591 "PhotoFileFormat.c"
+#line 2593 "PhotoFileFormat.c"
 	}
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (old) {
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		photo_file_format_driver_unref (old);
-#line 2597 "PhotoFileFormat.c"
+#line 2599 "PhotoFileFormat.c"
 	}
 }
 
@@ -2604,29 +2606,29 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = photo_file_format_driver_real_create_sniffer;
-#line 2623 "PhotoFileFormat.c"
+	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) photo_file_format_driver_real_create_sniffer;
+#line 2625 "PhotoFileFormat.c"
 }
 
 
 static void photo_file_format_driver_instance_init (PhotoFileFormatDriver * self) {
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	self->ref_count = 1;
-#line 2630 "PhotoFileFormat.c"
+#line 2632 "PhotoFileFormat.c"
 }
 
 
@@ -2636,7 +2638,7 @@ static void photo_file_format_driver_finalize (PhotoFileFormatDriver* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_FORMAT_DRIVER, PhotoFileFormatDriver);
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_signal_handlers_destroy (self);
-#line 2640 "PhotoFileFormat.c"
+#line 2642 "PhotoFileFormat.c"
 }
 
 
@@ -2661,7 +2663,7 @@ gpointer photo_file_format_driver_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return instance;
-#line 2665 "PhotoFileFormat.c"
+#line 2667 "PhotoFileFormat.c"
 }
 
 
@@ -2674,7 +2676,7 @@ void photo_file_format_driver_unref (gpointer instance) {
 		PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->finalize (self);
 #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2678 "PhotoFileFormat.c"
+#line 2680 "PhotoFileFormat.c"
 	}
 }
 
@@ -2696,7 +2698,7 @@ static PhotoFileFormat photo_file_format_properties_real_get_file_format (PhotoF
 	g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_file_format'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 374 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return 0;
-#line 2700 "PhotoFileFormat.c"
+#line 2702 "PhotoFileFormat.c"
 }
 
 
@@ -2705,7 +2707,7 @@ PhotoFileFormat photo_file_format_properties_get_file_format (PhotoFileFormatPro
 	g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), 0);
 #line 374 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_file_format (self);
-#line 2709 "PhotoFileFormat.c"
+#line 2711 "PhotoFileFormat.c"
 }
 
 
@@ -2714,7 +2716,7 @@ static PhotoFileFormatFlags photo_file_format_properties_real_get_flags (PhotoFi
 	g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_flags'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 376 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return 0;
-#line 2718 "PhotoFileFormat.c"
+#line 2720 "PhotoFileFormat.c"
 }
 
 
@@ -2723,7 +2725,7 @@ PhotoFileFormatFlags photo_file_format_properties_get_flags (PhotoFileFormatProp
 	g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), 0);
 #line 376 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_flags (self);
-#line 2727 "PhotoFileFormat.c"
+#line 2729 "PhotoFileFormat.c"
 }
 
 
@@ -2756,7 +2758,7 @@ static gboolean photo_file_format_properties_real_is_recognized_extension (Photo
 	result = _tmp5_;
 #line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return result;
-#line 2760 "PhotoFileFormat.c"
+#line 2762 "PhotoFileFormat.c"
 }
 
 
@@ -2765,7 +2767,7 @@ gboolean photo_file_format_properties_is_recognized_extension (PhotoFileFormatPr
 	g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), FALSE);
 #line 380 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->is_recognized_extension (self, ext);
-#line 2769 "PhotoFileFormat.c"
+#line 2771 "PhotoFileFormat.c"
 }
 
 
@@ -2774,7 +2776,7 @@ static gchar* photo_file_format_properties_real_get_default_extension (PhotoFile
 	g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_default_extension'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 384 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return NULL;
-#line 2778 "PhotoFileFormat.c"
+#line 2780 "PhotoFileFormat.c"
 }
 
 
@@ -2783,7 +2785,7 @@ gchar* photo_file_format_properties_get_default_extension (PhotoFileFormatProper
 	g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL);
 #line 384 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_default_extension (self);
-#line 2787 "PhotoFileFormat.c"
+#line 2789 "PhotoFileFormat.c"
 }
 
 
@@ -2792,7 +2794,7 @@ static gchar** photo_file_format_properties_real_get_known_extensions (PhotoFile
 	g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_known_extensions'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 386 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return NULL;
-#line 2796 "PhotoFileFormat.c"
+#line 2798 "PhotoFileFormat.c"
 }
 
 
@@ -2801,7 +2803,7 @@ gchar** photo_file_format_properties_get_known_extensions (PhotoFileFormatProper
 	g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL);
 #line 386 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_known_extensions (self, result_length1);
-#line 2805 "PhotoFileFormat.c"
+#line 2807 "PhotoFileFormat.c"
 }
 
 
@@ -2810,7 +2812,7 @@ static gchar* photo_file_format_properties_real_get_default_mime_type (PhotoFile
 	g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_default_mime_type'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 388 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return NULL;
-#line 2814 "PhotoFileFormat.c"
+#line 2816 "PhotoFileFormat.c"
 }
 
 
@@ -2819,7 +2821,7 @@ gchar* photo_file_format_properties_get_default_mime_type (PhotoFileFormatProper
 	g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL);
 #line 388 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_default_mime_type (self);
-#line 2823 "PhotoFileFormat.c"
+#line 2825 "PhotoFileFormat.c"
 }
 
 
@@ -2828,7 +2830,7 @@ static gchar** photo_file_format_properties_real_get_mime_types (PhotoFileFormat
 	g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_mime_types'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 390 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return NULL;
-#line 2832 "PhotoFileFormat.c"
+#line 2834 "PhotoFileFormat.c"
 }
 
 
@@ -2837,7 +2839,7 @@ gchar** photo_file_format_properties_get_mime_types (PhotoFileFormatProperties*
 	g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL);
 #line 390 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_mime_types (self, result_length1);
-#line 2841 "PhotoFileFormat.c"
+#line 2843 "PhotoFileFormat.c"
 }
 
 
@@ -2846,7 +2848,7 @@ static gchar* photo_file_format_properties_real_get_user_visible_name (PhotoFile
 	g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_user_visible_name'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 397 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return NULL;
-#line 2850 "PhotoFileFormat.c"
+#line 2852 "PhotoFileFormat.c"
 }
 
 
@@ -2855,14 +2857,14 @@ gchar* photo_file_format_properties_get_user_visible_name (PhotoFileFormatProper
 	g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL);
 #line 397 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_user_visible_name (self);
-#line 2859 "PhotoFileFormat.c"
+#line 2861 "PhotoFileFormat.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2866 "PhotoFileFormat.c"
+#line 2868 "PhotoFileFormat.c"
 }
 
 
@@ -2913,7 +2915,7 @@ GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatPrope
 	_tmp6_ = ext;
 #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (_tmp6_ != NULL) {
-#line 2917 "PhotoFileFormat.c"
+#line 2919 "PhotoFileFormat.c"
 		const gchar* _tmp7_ = NULL;
 		gboolean _tmp8_ = FALSE;
 #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2922,15 +2924,15 @@ GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatPrope
 		_tmp8_ = photo_file_format_properties_is_recognized_extension (self, _tmp7_);
 #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		_tmp5_ = _tmp8_;
-#line 2926 "PhotoFileFormat.c"
+#line 2928 "PhotoFileFormat.c"
 	} else {
 #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		_tmp5_ = FALSE;
-#line 2930 "PhotoFileFormat.c"
+#line 2932 "PhotoFileFormat.c"
 	}
 #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (_tmp5_) {
-#line 2934 "PhotoFileFormat.c"
+#line 2936 "PhotoFileFormat.c"
 		GFile* _tmp9_ = NULL;
 		GFile* _tmp10_ = NULL;
 #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2945,7 +2947,7 @@ GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatPrope
 		_g_free0 (name);
 #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		return result;
-#line 2949 "PhotoFileFormat.c"
+#line 2951 "PhotoFileFormat.c"
 	}
 #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp11_ = file;
@@ -2981,7 +2983,7 @@ GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatPrope
 	_g_free0 (name);
 #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return result;
-#line 2985 "PhotoFileFormat.c"
+#line 2987 "PhotoFileFormat.c"
 }
 
 
@@ -2991,14 +2993,14 @@ PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_
 	self = (PhotoFileFormatProperties*) g_type_create_instance (object_type);
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return self;
-#line 2995 "PhotoFileFormat.c"
+#line 2997 "PhotoFileFormat.c"
 }
 
 
 static void value_photo_file_format_properties_init (GValue* value) {
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	value->data[0].v_pointer = NULL;
-#line 3002 "PhotoFileFormat.c"
+#line 3004 "PhotoFileFormat.c"
 }
 
 
@@ -3007,7 +3009,7 @@ static void value_photo_file_format_properties_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		photo_file_format_properties_unref (value->data[0].v_pointer);
-#line 3011 "PhotoFileFormat.c"
+#line 3013 "PhotoFileFormat.c"
 	}
 }
 
@@ -3017,11 +3019,11 @@ static void value_photo_file_format_properties_copy_value (const GValue* src_val
 	if (src_value->data[0].v_pointer) {
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		dest_value->data[0].v_pointer = photo_file_format_properties_ref (src_value->data[0].v_pointer);
-#line 3021 "PhotoFileFormat.c"
+#line 3023 "PhotoFileFormat.c"
 	} else {
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3025 "PhotoFileFormat.c"
+#line 3027 "PhotoFileFormat.c"
 	}
 }
 
@@ -3029,37 +3031,37 @@ static void value_photo_file_format_properties_copy_value (const GValue* src_val
 static gpointer value_photo_file_format_properties_peek_pointer (const GValue* value) {
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return value->data[0].v_pointer;
-#line 3033 "PhotoFileFormat.c"
+#line 3035 "PhotoFileFormat.c"
 }
 
 
 static gchar* value_photo_file_format_properties_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (collect_values[0].v_pointer) {
-#line 3040 "PhotoFileFormat.c"
+#line 3042 "PhotoFileFormat.c"
 		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) {
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3047 "PhotoFileFormat.c"
+#line 3049 "PhotoFileFormat.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.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 3051 "PhotoFileFormat.c"
+#line 3053 "PhotoFileFormat.c"
 		}
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		value->data[0].v_pointer = photo_file_format_properties_ref (object);
-#line 3055 "PhotoFileFormat.c"
+#line 3057 "PhotoFileFormat.c"
 	} else {
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		value->data[0].v_pointer = NULL;
-#line 3059 "PhotoFileFormat.c"
+#line 3061 "PhotoFileFormat.c"
 	}
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return NULL;
-#line 3063 "PhotoFileFormat.c"
+#line 3065 "PhotoFileFormat.c"
 }
 
 
@@ -3070,25 +3072,25 @@ static gchar* value_photo_file_format_properties_lcopy_value (const GValue* valu
 	if (!object_p) {
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3074 "PhotoFileFormat.c"
+#line 3076 "PhotoFileFormat.c"
 	}
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (!value->data[0].v_pointer) {
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		*object_p = NULL;
-#line 3080 "PhotoFileFormat.c"
+#line 3082 "PhotoFileFormat.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3084 "PhotoFileFormat.c"
+#line 3086 "PhotoFileFormat.c"
 	} else {
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		*object_p = photo_file_format_properties_ref (value->data[0].v_pointer);
-#line 3088 "PhotoFileFormat.c"
+#line 3090 "PhotoFileFormat.c"
 	}
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return NULL;
-#line 3092 "PhotoFileFormat.c"
+#line 3094 "PhotoFileFormat.c"
 }
 
 
@@ -3102,7 +3104,7 @@ GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return G_PARAM_SPEC (spec);
-#line 3106 "PhotoFileFormat.c"
+#line 3108 "PhotoFileFormat.c"
 }
 
 
@@ -3111,7 +3113,7 @@ gpointer value_get_photo_file_format_properties (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_PROPERTIES), NULL);
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return value->data[0].v_pointer;
-#line 3115 "PhotoFileFormat.c"
+#line 3117 "PhotoFileFormat.c"
 }
 
 
@@ -3131,17 +3133,17 @@ void value_set_photo_file_format_properties (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		photo_file_format_properties_ref (value->data[0].v_pointer);
-#line 3135 "PhotoFileFormat.c"
+#line 3137 "PhotoFileFormat.c"
 	} else {
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		value->data[0].v_pointer = NULL;
-#line 3139 "PhotoFileFormat.c"
+#line 3141 "PhotoFileFormat.c"
 	}
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (old) {
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		photo_file_format_properties_unref (old);
-#line 3145 "PhotoFileFormat.c"
+#line 3147 "PhotoFileFormat.c"
 	}
 }
 
@@ -3160,17 +3162,17 @@ void value_take_photo_file_format_properties (GValue* value, gpointer v_object)
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		value->data[0].v_pointer = v_object;
-#line 3164 "PhotoFileFormat.c"
+#line 3166 "PhotoFileFormat.c"
 	} else {
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		value->data[0].v_pointer = NULL;
-#line 3168 "PhotoFileFormat.c"
+#line 3170 "PhotoFileFormat.c"
 	}
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if (old) {
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		photo_file_format_properties_unref (old);
-#line 3174 "PhotoFileFormat.c"
+#line 3176 "PhotoFileFormat.c"
 	}
 }
 
@@ -3181,29 +3183,29 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = photo_file_format_properties_real_get_user_visible_name;
-#line 3200 "PhotoFileFormat.c"
+	((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_user_visible_name;
+#line 3202 "PhotoFileFormat.c"
 }
 
 
 static void photo_file_format_properties_instance_init (PhotoFileFormatProperties * self) {
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	self->ref_count = 1;
-#line 3207 "PhotoFileFormat.c"
+#line 3209 "PhotoFileFormat.c"
 }
 
 
@@ -3213,7 +3215,7 @@ static void photo_file_format_properties_finalize (PhotoFileFormatProperties* ob
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties);
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	g_signal_handlers_destroy (self);
-#line 3217 "PhotoFileFormat.c"
+#line 3219 "PhotoFileFormat.c"
 }
 
 
@@ -3238,7 +3240,7 @@ gpointer photo_file_format_properties_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return instance;
-#line 3242 "PhotoFileFormat.c"
+#line 3244 "PhotoFileFormat.c"
 }
 
 
@@ -3251,7 +3253,7 @@ void photo_file_format_properties_unref (gpointer instance) {
 		PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->finalize (self);
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3255 "PhotoFileFormat.c"
+#line 3257 "PhotoFileFormat.c"
 	}
 }
 
diff --git a/src/photos/PhotoFileSniffer.c b/src/photos/PhotoFileSniffer.c
index 50a71b1..86295b3 100644
--- a/src/photos/PhotoFileSniffer.c
+++ b/src/photos/PhotoFileSniffer.c
@@ -1,4 +1,4 @@
-/* PhotoFileSniffer.c generated by valac 0.34.4, the Vala compiler
+/* PhotoFileSniffer.c generated by valac 0.34.7, the Vala compiler
  * generated from PhotoFileSniffer.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = photo_file_sniffer_real_sniff;
+	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) photo_file_sniffer_real_sniff;
 #line 792 "PhotoFileSniffer.c"
 }
 
diff --git a/src/photos/PhotoMetadata.c b/src/photos/PhotoMetadata.c
index 7748685..a30a3b4 100644
--- a/src/photos/PhotoMetadata.c
+++ b/src/photos/PhotoMetadata.c
@@ -1,4 +1,4 @@
-/* PhotoMetadata.c generated by valac 0.34.4, the Vala compiler
+/* PhotoMetadata.c generated by valac 0.34.7, the Vala compiler
  * generated from PhotoMetadata.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -970,7 +970,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 = keyword_transformer_real_transform;
+	((KeywordTransformerClass *) klass)->transform = (GeeList* (*)(KeywordTransformer*, const gchar*, GError**)) keyword_transformer_real_transform;
 #line 975 "PhotoMetadata.c"
 }
 
@@ -1042,7 +1042,7 @@ static GeeList* null_keyword_transformer_real_transform (KeywordTransformer* bas
 #line 36 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (input != NULL, NULL);
 #line 37 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 37 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_result_ = _tmp0_;
 #line 38 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1078,7 +1078,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 = null_keyword_transformer_real_transform;
+	((KeywordTransformerClass *) klass)->transform = (GeeList* (*)(KeywordTransformer*, const gchar*, GError**)) null_keyword_transformer_real_transform;
 #line 1083 "PhotoMetadata.c"
 }
 
@@ -1144,13 +1144,13 @@ ACDSeeKeywordTransformer* acd_see_keyword_transformer_construct (GType object_ty
 #line 67 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->parser.error = _acd_see_keyword_transformer_on_error_gmarkup_parser_error_func;
 #line 68 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 68 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (self->priv->result);
 #line 68 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->result = _tmp0_;
 #line 69 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp1_ = gee_array_queue_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+	_tmp1_ = gee_array_queue_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 69 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (self->priv->stack);
 #line 69 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1489,7 +1489,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 = acd_see_keyword_transformer_real_transform;
+	((KeywordTransformerClass *) klass)->transform = (GeeList* (*)(KeywordTransformer*, const gchar*, GError**)) acd_see_keyword_transformer_real_transform;
 #line 1494 "PhotoMetadata.c"
 }
 
@@ -2321,9 +2321,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 = 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 = photo_preview_real_get_pixbuf;
+	((PhotoPreviewClass *) klass)->get_pixbuf = (GdkPixbuf* (*)(PhotoPreview*, GError**)) photo_preview_real_get_pixbuf;
 #line 2328 "PhotoMetadata.c"
 }
 
@@ -3042,7 +3042,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
 #line 3043 "PhotoMetadata.c"
 		GeeHashSet* _tmp1_ = NULL;
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp1_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+		_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"
 		result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SET, GeeSet);
 #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3068,9 +3068,13 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
 #line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2__target_destroy_notify = compare_func_target_destroy_notify;
 #line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		compare_func = NULL;
+#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		compare_func_target = NULL;
+#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func_target_destroy_notify = NULL;
 #line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp3_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, _tmp2_, _tmp2__target, _tmp2__target_destroy_notify);
+		_tmp3_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, _tmp2_, _tmp2__target, _tmp2__target_destroy_notify);
 #line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_SET, GeeSet);
 #line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3083,7 +3087,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
 		compare_func_target_destroy_notify = NULL;
 #line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 3087 "PhotoMetadata.c"
+#line 3091 "PhotoMetadata.c"
 	}
 #line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL);
@@ -3093,7 +3097,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
 	compare_func_target = NULL;
 #line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target_destroy_notify = NULL;
-#line 3097 "PhotoMetadata.c"
+#line 3101 "PhotoMetadata.c"
 }
 
 
@@ -3127,7 +3131,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 	switch (_tmp0_) {
 #line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_EXIF:
-#line 3131 "PhotoMetadata.c"
+#line 3135 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp1_ = NULL;
 			gchar** _tmp2_ = NULL;
@@ -3146,11 +3150,11 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 			_tags_size_ = tags_length1;
 #line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 3150 "PhotoMetadata.c"
+#line 3154 "PhotoMetadata.c"
 		}
 #line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_XMP:
-#line 3154 "PhotoMetadata.c"
+#line 3158 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp4_ = NULL;
 			gchar** _tmp5_ = NULL;
@@ -3169,11 +3173,11 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 			_tags_size_ = tags_length1;
 #line 388 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 3173 "PhotoMetadata.c"
+#line 3177 "PhotoMetadata.c"
 		}
 #line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_IPTC:
-#line 3177 "PhotoMetadata.c"
+#line 3181 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp7_ = NULL;
 			gchar** _tmp8_ = NULL;
@@ -3192,12 +3196,12 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 			_tags_size_ = tags_length1;
 #line 392 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 3196 "PhotoMetadata.c"
+#line 3200 "PhotoMetadata.c"
 		}
 		default:
 #line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		break;
-#line 3201 "PhotoMetadata.c"
+#line 3205 "PhotoMetadata.c"
 	}
 #line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_ = tags;
@@ -3207,7 +3211,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 	if (_tmp11_ == NULL) {
 #line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = TRUE;
-#line 3211 "PhotoMetadata.c"
+#line 3215 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp12_ = NULL;
 		gint _tmp12__length1 = 0;
@@ -3217,7 +3221,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 		_tmp12__length1 = tags_length1;
 #line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = _tmp12__length1 == 0;
-#line 3221 "PhotoMetadata.c"
+#line 3225 "PhotoMetadata.c"
 	}
 #line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp10_) {
@@ -3235,7 +3239,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 		compare_func_target_destroy_notify = NULL;
 #line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 3239 "PhotoMetadata.c"
+#line 3243 "PhotoMetadata.c"
 	}
 #line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp13_ = compare_func;
@@ -3244,6 +3248,10 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 #line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp13__target_destroy_notify = compare_func_target_destroy_notify;
 #line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	compare_func = NULL;
+#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	compare_func_target = NULL;
+#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target_destroy_notify = NULL;
 #line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp14_ = photo_metadata_create_string_set (self, _tmp13_, _tmp13__target, _tmp13__target_destroy_notify);
@@ -3253,7 +3261,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 	_tmp15_ = tags;
 #line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp15__length1 = tags_length1;
-#line 3257 "PhotoMetadata.c"
+#line 3265 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -3265,14 +3273,14 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 		tag_collection_length1 = _tmp15__length1;
 #line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp15__length1; tag_it = tag_it + 1) {
-#line 3269 "PhotoMetadata.c"
+#line 3277 "PhotoMetadata.c"
 			gchar* _tmp16_ = NULL;
 			gchar* tag = NULL;
 #line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp16_ = g_strdup (tag_collection[tag_it]);
 #line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp16_;
-#line 3276 "PhotoMetadata.c"
+#line 3284 "PhotoMetadata.c"
 			{
 				GeeCollection* _tmp17_ = NULL;
 				const gchar* _tmp18_ = NULL;
@@ -3284,7 +3292,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 				gee_collection_add (_tmp17_, _tmp18_);
 #line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 3288 "PhotoMetadata.c"
+#line 3296 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -3302,7 +3310,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 	compare_func_target_destroy_notify = NULL;
 #line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3306 "PhotoMetadata.c"
+#line 3314 "PhotoMetadata.c"
 }
 
 
@@ -3339,6 +3347,10 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 #line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__target_destroy_notify = compare_func_target_destroy_notify;
 #line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	compare_func = NULL;
+#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	compare_func_target = NULL;
+#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target_destroy_notify = NULL;
 #line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_create_string_set (self, _tmp0_, _tmp0__target, _tmp0__target_destroy_notify);
@@ -3352,7 +3364,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 	_tmp4_ = exif_tags;
 #line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_ != NULL) {
-#line 3356 "PhotoMetadata.c"
+#line 3368 "PhotoMetadata.c"
 		GeeCollection* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -3364,15 +3376,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 		_tmp7_ = _tmp6_;
 #line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = _tmp7_ > 0;
-#line 3368 "PhotoMetadata.c"
+#line 3380 "PhotoMetadata.c"
 	} else {
 #line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = FALSE;
-#line 3372 "PhotoMetadata.c"
+#line 3384 "PhotoMetadata.c"
 	}
 #line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
-#line 3376 "PhotoMetadata.c"
+#line 3388 "PhotoMetadata.c"
 		GeeCollection* _tmp8_ = NULL;
 		GeeCollection* _tmp9_ = NULL;
 #line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3381,7 +3393,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 		_tmp9_ = exif_tags;
 #line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		gee_collection_add_all (_tmp8_, _tmp9_);
-#line 3385 "PhotoMetadata.c"
+#line 3397 "PhotoMetadata.c"
 	}
 #line 413 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp10_ = photo_metadata_get_tags (self, METADATA_DOMAIN_XMP, NULL, NULL, NULL);
@@ -3391,7 +3403,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 	_tmp12_ = xmp_tags;
 #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp12_ != NULL) {
-#line 3395 "PhotoMetadata.c"
+#line 3407 "PhotoMetadata.c"
 		GeeCollection* _tmp13_ = NULL;
 		gint _tmp14_ = 0;
 		gint _tmp15_ = 0;
@@ -3403,15 +3415,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 		_tmp15_ = _tmp14_;
 #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp11_ = _tmp15_ > 0;
-#line 3407 "PhotoMetadata.c"
+#line 3419 "PhotoMetadata.c"
 	} else {
 #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp11_ = FALSE;
-#line 3411 "PhotoMetadata.c"
+#line 3423 "PhotoMetadata.c"
 	}
 #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp11_) {
-#line 3415 "PhotoMetadata.c"
+#line 3427 "PhotoMetadata.c"
 		GeeCollection* _tmp16_ = NULL;
 		GeeCollection* _tmp17_ = NULL;
 #line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3420,7 +3432,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 		_tmp17_ = xmp_tags;
 #line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		gee_collection_add_all (_tmp16_, _tmp17_);
-#line 3424 "PhotoMetadata.c"
+#line 3436 "PhotoMetadata.c"
 	}
 #line 417 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp18_ = photo_metadata_get_tags (self, METADATA_DOMAIN_IPTC, NULL, NULL, NULL);
@@ -3430,7 +3442,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 	_tmp20_ = iptc_tags;
 #line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp20_ != NULL) {
-#line 3434 "PhotoMetadata.c"
+#line 3446 "PhotoMetadata.c"
 		GeeCollection* _tmp21_ = NULL;
 		gint _tmp22_ = 0;
 		gint _tmp23_ = 0;
@@ -3442,15 +3454,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 		_tmp23_ = _tmp22_;
 #line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp19_ = _tmp23_ > 0;
-#line 3446 "PhotoMetadata.c"
+#line 3458 "PhotoMetadata.c"
 	} else {
 #line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp19_ = FALSE;
-#line 3450 "PhotoMetadata.c"
+#line 3462 "PhotoMetadata.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp19_) {
-#line 3454 "PhotoMetadata.c"
+#line 3466 "PhotoMetadata.c"
 		GeeCollection* _tmp24_ = NULL;
 		GeeCollection* _tmp25_ = NULL;
 #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3459,7 +3471,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 		_tmp25_ = iptc_tags;
 #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		gee_collection_add_all (_tmp24_, _tmp25_);
-#line 3463 "PhotoMetadata.c"
+#line 3475 "PhotoMetadata.c"
 	}
 #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp27_ = all_tags;
@@ -3469,17 +3481,17 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 	_tmp29_ = _tmp28_;
 #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp29_ > 0) {
-#line 3473 "PhotoMetadata.c"
+#line 3485 "PhotoMetadata.c"
 		GeeCollection* _tmp30_ = NULL;
 #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp30_ = all_tags;
 #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp26_ = _tmp30_;
-#line 3479 "PhotoMetadata.c"
+#line 3491 "PhotoMetadata.c"
 	} else {
 #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp26_ = NULL;
-#line 3483 "PhotoMetadata.c"
+#line 3495 "PhotoMetadata.c"
 	}
 #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp31_ = _g_object_ref0 (_tmp26_);
@@ -3503,7 +3515,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 	compare_func_target_destroy_notify = NULL;
 #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3507 "PhotoMetadata.c"
+#line 3519 "PhotoMetadata.c"
 }
 
 
@@ -3526,7 +3538,7 @@ gchar* photo_metadata_get_tag_label (PhotoMetadata* self, const gchar* tag) {
 	result = _tmp2_;
 #line 425 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3530 "PhotoMetadata.c"
+#line 3542 "PhotoMetadata.c"
 }
 
 
@@ -3549,7 +3561,7 @@ gchar* photo_metadata_get_tag_description (PhotoMetadata* self, const gchar* tag
 	result = _tmp2_;
 #line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3553 "PhotoMetadata.c"
+#line 3565 "PhotoMetadata.c"
 }
 
 
@@ -3586,7 +3598,7 @@ gchar* photo_metadata_get_string (PhotoMetadata* self, const gchar* tag, Prepare
 	result = _tmp6_;
 #line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3590 "PhotoMetadata.c"
+#line 3602 "PhotoMetadata.c"
 }
 
 
@@ -3623,7 +3635,7 @@ gchar* photo_metadata_get_string_interpreted (PhotoMetadata* self, const gchar*
 	result = _tmp6_;
 #line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3627 "PhotoMetadata.c"
+#line 3639 "PhotoMetadata.c"
 }
 
 
@@ -3637,7 +3649,7 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
 	_tmp0_ = tags;
 #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 3641 "PhotoMetadata.c"
+#line 3653 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -3649,14 +3661,14 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
 		tag_collection_length1 = _tmp0__length1;
 #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 3653 "PhotoMetadata.c"
+#line 3665 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
 #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
 #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 3660 "PhotoMetadata.c"
+#line 3672 "PhotoMetadata.c"
 			{
 				gchar* value = NULL;
 				const gchar* _tmp2_ = NULL;
@@ -3678,13 +3690,13 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
 					_g_free0 (tag);
 #line 444 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 3682 "PhotoMetadata.c"
+#line 3694 "PhotoMetadata.c"
 				}
 #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (value);
 #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 3688 "PhotoMetadata.c"
+#line 3700 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -3692,7 +3704,7 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
 	result = NULL;
 #line 447 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3696 "PhotoMetadata.c"
+#line 3708 "PhotoMetadata.c"
 }
 
 
@@ -3706,7 +3718,7 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
 	_tmp0_ = tags;
 #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 3710 "PhotoMetadata.c"
+#line 3722 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -3718,14 +3730,14 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
 		tag_collection_length1 = _tmp0__length1;
 #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 3722 "PhotoMetadata.c"
+#line 3734 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
 #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
 #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 3729 "PhotoMetadata.c"
+#line 3741 "PhotoMetadata.c"
 			{
 				gchar* value = NULL;
 				const gchar* _tmp2_ = NULL;
@@ -3747,13 +3759,13 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
 					_g_free0 (tag);
 #line 454 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 3751 "PhotoMetadata.c"
+#line 3763 "PhotoMetadata.c"
 				}
 #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (value);
 #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 3757 "PhotoMetadata.c"
+#line 3769 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -3761,7 +3773,7 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
 	result = NULL;
 #line 457 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3765 "PhotoMetadata.c"
+#line 3777 "PhotoMetadata.c"
 }
 
 
@@ -3812,7 +3824,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 	if (_tmp5_ == NULL) {
 #line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = TRUE;
-#line 3816 "PhotoMetadata.c"
+#line 3828 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
@@ -3822,7 +3834,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 		_tmp6__length1 = values_length1;
 #line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = _tmp6__length1 == 0;
-#line 3826 "PhotoMetadata.c"
+#line 3838 "PhotoMetadata.c"
 	}
 #line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_) {
@@ -3832,21 +3844,21 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 		values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
 #line 469 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 3836 "PhotoMetadata.c"
+#line 3848 "PhotoMetadata.c"
 	}
 #line 471 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+	_tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 471 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	list = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_LIST, GeeList);
 #line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp8_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp8_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	collection = _tmp8_;
 #line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9_ = values;
 #line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9__length1 = values_length1;
-#line 3850 "PhotoMetadata.c"
+#line 3862 "PhotoMetadata.c"
 	{
 		gchar** value_collection = NULL;
 		gint value_collection_length1 = 0;
@@ -3858,14 +3870,14 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 		value_collection_length1 = _tmp9__length1;
 #line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (value_it = 0; value_it < _tmp9__length1; value_it = value_it + 1) {
-#line 3862 "PhotoMetadata.c"
+#line 3874 "PhotoMetadata.c"
 			gchar* _tmp10_ = NULL;
 			gchar* value = NULL;
 #line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp10_ = g_strdup (value_collection[value_it]);
 #line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			value = _tmp10_;
-#line 3869 "PhotoMetadata.c"
+#line 3881 "PhotoMetadata.c"
 			{
 				gchar* prepped = NULL;
 				const gchar* _tmp11_ = NULL;
@@ -3882,7 +3894,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 				_tmp14_ = prepped;
 #line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp14_ != NULL) {
-#line 3886 "PhotoMetadata.c"
+#line 3898 "PhotoMetadata.c"
 					GeeHashSet* _tmp15_ = NULL;
 					const gchar* _tmp16_ = NULL;
 					gboolean _tmp17_ = FALSE;
@@ -3894,15 +3906,15 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 					_tmp17_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_);
 #line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp13_ = !_tmp17_;
-#line 3898 "PhotoMetadata.c"
+#line 3910 "PhotoMetadata.c"
 				} else {
 #line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp13_ = FALSE;
-#line 3902 "PhotoMetadata.c"
+#line 3914 "PhotoMetadata.c"
 				}
 #line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp13_) {
-#line 3906 "PhotoMetadata.c"
+#line 3918 "PhotoMetadata.c"
 					GeeList* _tmp18_ = NULL;
 					const gchar* _tmp19_ = NULL;
 					GeeHashSet* _tmp20_ = NULL;
@@ -3919,13 +3931,13 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 					_tmp21_ = prepped;
 #line 480 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_);
-#line 3923 "PhotoMetadata.c"
+#line 3935 "PhotoMetadata.c"
 				}
 #line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (prepped);
 #line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (value);
-#line 3929 "PhotoMetadata.c"
+#line 3941 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -3937,17 +3949,17 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 	_tmp25_ = _tmp24_;
 #line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp25_ > 0) {
-#line 3941 "PhotoMetadata.c"
+#line 3953 "PhotoMetadata.c"
 		GeeList* _tmp26_ = NULL;
 #line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp26_ = list;
 #line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp22_ = _tmp26_;
-#line 3947 "PhotoMetadata.c"
+#line 3959 "PhotoMetadata.c"
 	} else {
 #line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp22_ = NULL;
-#line 3951 "PhotoMetadata.c"
+#line 3963 "PhotoMetadata.c"
 	}
 #line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp27_ = _g_object_ref0 (_tmp22_);
@@ -3961,7 +3973,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 	values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
 #line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3965 "PhotoMetadata.c"
+#line 3977 "PhotoMetadata.c"
 }
 
 
@@ -3975,7 +3987,7 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
 	_tmp0_ = tags;
 #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 3979 "PhotoMetadata.c"
+#line 3991 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -3987,14 +3999,14 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
 		tag_collection_length1 = _tmp0__length1;
 #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 3991 "PhotoMetadata.c"
+#line 4003 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
 #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
 #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 3998 "PhotoMetadata.c"
+#line 4010 "PhotoMetadata.c"
 			{
 				GeeList* values = NULL;
 				const gchar* _tmp2_ = NULL;
@@ -4011,7 +4023,7 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
 				_tmp5_ = values;
 #line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp5_ != NULL) {
-#line 4015 "PhotoMetadata.c"
+#line 4027 "PhotoMetadata.c"
 					GeeList* _tmp6_ = NULL;
 					gint _tmp7_ = 0;
 					gint _tmp8_ = 0;
@@ -4023,11 +4035,11 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
 					_tmp8_ = _tmp7_;
 #line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp4_ = _tmp8_ > 0;
-#line 4027 "PhotoMetadata.c"
+#line 4039 "PhotoMetadata.c"
 				} else {
 #line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp4_ = FALSE;
-#line 4031 "PhotoMetadata.c"
+#line 4043 "PhotoMetadata.c"
 				}
 #line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp4_) {
@@ -4037,13 +4049,13 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
 					_g_free0 (tag);
 #line 497 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 4041 "PhotoMetadata.c"
+#line 4053 "PhotoMetadata.c"
 				}
 #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_object_unref0 (values);
 #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 4047 "PhotoMetadata.c"
+#line 4059 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -4051,7 +4063,7 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
 	result = NULL;
 #line 500 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 4055 "PhotoMetadata.c"
+#line 4067 "PhotoMetadata.c"
 }
 
 
@@ -4083,7 +4095,7 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
 	_tmp3_ = prepped;
 #line 505 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_ == NULL) {
-#line 4087 "PhotoMetadata.c"
+#line 4099 "PhotoMetadata.c"
 		const gchar* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
 #line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4096,7 +4108,7 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
 		_g_free0 (prepped);
 #line 508 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 4100 "PhotoMetadata.c"
+#line 4112 "PhotoMetadata.c"
 	}
 #line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = self->priv->exiv2;
@@ -4108,7 +4120,7 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
 	_tmp9_ = gexiv2_metadata_set_tag_string (_tmp6_, _tmp7_, _tmp8_);
 #line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp9_) {
-#line 4112 "PhotoMetadata.c"
+#line 4124 "PhotoMetadata.c"
 		const gchar* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
@@ -4121,11 +4133,11 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
 #line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_warning ("PhotoMetadata.vala:512: Unable to set tag %s to string %s from source " \
 "%s", _tmp10_, _tmp11_, _tmp12_);
-#line 4124 "PhotoMetadata.c"
+#line 4136 "PhotoMetadata.c"
 	}
 #line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (prepped);
-#line 4128 "PhotoMetadata.c"
+#line 4140 "PhotoMetadata.c"
 }
 
 
@@ -4144,7 +4156,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 	_tmp0_ = tags;
 #line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 4147 "PhotoMetadata.c"
+#line 4159 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -4156,14 +4168,14 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 		tag_collection_length1 = _tmp0__length1;
 #line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 4159 "PhotoMetadata.c"
+#line 4171 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
 #line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
 #line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 4166 "PhotoMetadata.c"
+#line 4178 "PhotoMetadata.c"
 			{
 				gboolean _tmp2_ = FALSE;
 				PhotoMetadataSetOption _tmp3_ = 0;
@@ -4173,7 +4185,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 				if (_tmp3_ == PHOTO_METADATA_SET_OPTION_ALL_DOMAINS) {
 #line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp2_ = TRUE;
-#line 4176 "PhotoMetadata.c"
+#line 4188 "PhotoMetadata.c"
 				} else {
 					const gchar* _tmp4_ = NULL;
 					MetadataDomain _tmp5_ = 0;
@@ -4186,11 +4198,11 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 					_tmp6_ = photo_metadata_has_domain (self, _tmp5_);
 #line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp2_ = _tmp6_;
-#line 4189 "PhotoMetadata.c"
+#line 4201 "PhotoMetadata.c"
 				}
 #line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp2_) {
-#line 4193 "PhotoMetadata.c"
+#line 4205 "PhotoMetadata.c"
 					PhotoMetadataSetGenericValue _tmp7_ = NULL;
 					void* _tmp7__target = NULL;
 					const gchar* _tmp8_ = NULL;
@@ -4204,11 +4216,11 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 					_tmp7_ (_tmp8_, _tmp7__target);
 #line 522 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					written = TRUE;
-#line 4207 "PhotoMetadata.c"
+#line 4219 "PhotoMetadata.c"
 				}
 #line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 4211 "PhotoMetadata.c"
+#line 4223 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -4216,21 +4228,21 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 	_tmp11_ = option;
 #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp11_ == PHOTO_METADATA_SET_OPTION_AT_LEAST_DEFAULT_DOMAIN) {
-#line 4219 "PhotoMetadata.c"
+#line 4231 "PhotoMetadata.c"
 		gboolean _tmp12_ = FALSE;
 #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp12_ = written;
 #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = !_tmp12_;
-#line 4225 "PhotoMetadata.c"
+#line 4237 "PhotoMetadata.c"
 	} else {
 #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = FALSE;
-#line 4229 "PhotoMetadata.c"
+#line 4241 "PhotoMetadata.c"
 	}
 #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp10_) {
-#line 4233 "PhotoMetadata.c"
+#line 4245 "PhotoMetadata.c"
 		gchar** _tmp13_ = NULL;
 		gint _tmp13__length1 = 0;
 #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4239,15 +4251,15 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 		_tmp13__length1 = tags_length1;
 #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = _tmp13__length1 > 0;
-#line 4242 "PhotoMetadata.c"
+#line 4254 "PhotoMetadata.c"
 	} else {
 #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = FALSE;
-#line 4246 "PhotoMetadata.c"
+#line 4258 "PhotoMetadata.c"
 	}
 #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp9_) {
-#line 4250 "PhotoMetadata.c"
+#line 4262 "PhotoMetadata.c"
 		MetadataDomain default_domain = 0;
 		gchar** _tmp14_ = NULL;
 		gint _tmp14__length1 = 0;
@@ -4280,19 +4292,19 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 		_tmp19_ = _tmp18_[0];
 #line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp17_ (_tmp19_, _tmp17__target);
-#line 4283 "PhotoMetadata.c"
+#line 4295 "PhotoMetadata.c"
 		{
 			gint ctr = 0;
 #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			ctr = 1;
-#line 4288 "PhotoMetadata.c"
+#line 4300 "PhotoMetadata.c"
 			{
 				gboolean _tmp20_ = FALSE;
 #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp20_ = TRUE;
 #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				while (TRUE) {
-#line 4295 "PhotoMetadata.c"
+#line 4307 "PhotoMetadata.c"
 					gint _tmp22_ = 0;
 					gchar** _tmp23_ = NULL;
 					gint _tmp23__length1 = 0;
@@ -4304,13 +4316,13 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 					MetadataDomain _tmp28_ = 0;
 #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					if (!_tmp20_) {
-#line 4307 "PhotoMetadata.c"
+#line 4319 "PhotoMetadata.c"
 						gint _tmp21_ = 0;
 #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp21_ = ctr;
 #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						ctr = _tmp21_ + 1;
-#line 4313 "PhotoMetadata.c"
+#line 4325 "PhotoMetadata.c"
 					}
 #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp20_ = FALSE;
@@ -4324,7 +4336,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 					if (!(_tmp22_ < _tmp23__length1)) {
 #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						break;
-#line 4327 "PhotoMetadata.c"
+#line 4339 "PhotoMetadata.c"
 					}
 #line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp24_ = tags;
@@ -4340,7 +4352,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 					_tmp28_ = default_domain;
 #line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					if (_tmp27_ == _tmp28_) {
-#line 4343 "PhotoMetadata.c"
+#line 4355 "PhotoMetadata.c"
 						PhotoMetadataSetGenericValue _tmp29_ = NULL;
 						void* _tmp29__target = NULL;
 						gchar** _tmp30_ = NULL;
@@ -4361,7 +4373,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 						_tmp32_ = _tmp30_[_tmp31_];
 #line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp29_ (_tmp32_, _tmp29__target);
-#line 4364 "PhotoMetadata.c"
+#line 4376 "PhotoMetadata.c"
 					}
 				}
 			}
@@ -4375,7 +4387,7 @@ static Block1Data* block1_data_ref (Block1Data* _data1_) {
 	g_atomic_int_inc (&_data1_->_ref_count_);
 #line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return _data1_;
-#line 4378 "PhotoMetadata.c"
+#line 4390 "PhotoMetadata.c"
 }
 
 
@@ -4384,7 +4396,7 @@ static void block1_data_unref (void * _userdata_) {
 	_data1_ = (Block1Data*) _userdata_;
 #line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
-#line 4387 "PhotoMetadata.c"
+#line 4399 "PhotoMetadata.c"
 		PhotoMetadata* self;
 #line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		self = _data1_->self;
@@ -4394,7 +4406,7 @@ static void block1_data_unref (void * _userdata_) {
 		_media_metadata_unref0 (self);
 #line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_slice_free (Block1Data, _data1_);
-#line 4397 "PhotoMetadata.c"
+#line 4409 "PhotoMetadata.c"
 	}
 }
 
@@ -4413,14 +4425,14 @@ static void __lambda5_ (Block1Data* _data1_, const gchar* tag) {
 	_tmp1_ = _data1_->value;
 #line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_string (self, _tmp0_, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 4416 "PhotoMetadata.c"
+#line 4428 "PhotoMetadata.c"
 }
 
 
 static void ___lambda5__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
 #line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	__lambda5_ (self, tag);
-#line 4423 "PhotoMetadata.c"
+#line 4435 "PhotoMetadata.c"
 }
 
 
@@ -4461,7 +4473,7 @@ void photo_metadata_set_all_string (PhotoMetadata* self, gchar** tags, int tags_
 	block1_data_unref (_data1_);
 #line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data1_ = NULL;
-#line 4464 "PhotoMetadata.c"
+#line 4476 "PhotoMetadata.c"
 }
 
 
@@ -4472,13 +4484,13 @@ static void _vala_array_add45 (gchar*** array, int* length, int* size, gchar* va
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 4475 "PhotoMetadata.c"
+#line 4487 "PhotoMetadata.c"
 	}
 #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(*array)[(*length)++] = value;
 #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(*array)[*length] = NULL;
-#line 4481 "PhotoMetadata.c"
+#line 4493 "PhotoMetadata.c"
 }
 
 
@@ -4489,13 +4501,13 @@ static void _vala_array_add46 (gchar*** array, int* length, int* size, gchar* va
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 4492 "PhotoMetadata.c"
+#line 4504 "PhotoMetadata.c"
 	}
 #line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(*array)[(*length)++] = value;
 #line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(*array)[*length] = NULL;
-#line 4498 "PhotoMetadata.c"
+#line 4510 "PhotoMetadata.c"
 }
 
 
@@ -4527,7 +4539,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 	values_length1 = 0;
 #line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_values_size_ = values_length1;
-#line 4530 "PhotoMetadata.c"
+#line 4542 "PhotoMetadata.c"
 	{
 		GeeIterator* _value_it = NULL;
 		GeeCollection* _tmp1_ = NULL;
@@ -4540,7 +4552,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 		_value_it = _tmp2_;
 #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		while (TRUE) {
-#line 4543 "PhotoMetadata.c"
+#line 4555 "PhotoMetadata.c"
 			GeeIterator* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
 			gchar* value = NULL;
@@ -4558,7 +4570,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 			if (!_tmp4_) {
 #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				break;
-#line 4561 "PhotoMetadata.c"
+#line 4573 "PhotoMetadata.c"
 			}
 #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp5_ = _value_it;
@@ -4576,7 +4588,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 			_tmp9_ = prepped;
 #line 548 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			if (_tmp9_ != NULL) {
-#line 4579 "PhotoMetadata.c"
+#line 4591 "PhotoMetadata.c"
 				gchar** _tmp10_ = NULL;
 				gint _tmp10__length1 = 0;
 				const gchar* _tmp11_ = NULL;
@@ -4591,7 +4603,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 				_tmp12_ = g_strdup (_tmp11_);
 #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_vala_array_add45 (&values, &values_length1, &_values_size_, _tmp12_);
-#line 4594 "PhotoMetadata.c"
+#line 4606 "PhotoMetadata.c"
 			} else {
 				const gchar* _tmp13_ = NULL;
 				const gchar* _tmp14_ = NULL;
@@ -4601,17 +4613,17 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 				_tmp14_ = tag;
 #line 551 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				g_warning ("PhotoMetadata.vala:551: Unable to set string %s to %s: invalid UTF-8", _tmp13_, _tmp14_);
-#line 4604 "PhotoMetadata.c"
+#line 4616 "PhotoMetadata.c"
 			}
 #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (prepped);
 #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (value);
-#line 4610 "PhotoMetadata.c"
+#line 4622 "PhotoMetadata.c"
 		}
 #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_object_unref0 (_value_it);
-#line 4614 "PhotoMetadata.c"
+#line 4626 "PhotoMetadata.c"
 	}
 #line 554 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp15_ = values;
@@ -4623,7 +4635,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 		values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
 #line 555 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 4626 "PhotoMetadata.c"
+#line 4638 "PhotoMetadata.c"
 	}
 #line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp16_ = values;
@@ -4643,7 +4655,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 	_tmp20_ = gexiv2_metadata_set_tag_multiple (_tmp17_, _tmp18_, _tmp19_);
 #line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp20_) {
-#line 4646 "PhotoMetadata.c"
+#line 4658 "PhotoMetadata.c"
 		gchar** _tmp21_ = NULL;
 		gint _tmp21__length1 = 0;
 		const gchar* _tmp22_ = NULL;
@@ -4659,11 +4671,11 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 #line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_warning ("PhotoMetadata.vala:564: Unable to set %d strings to tag %s from source" \
 " %s", _tmp21__length1, _tmp22_, _tmp23_);
-#line 4661 "PhotoMetadata.c"
+#line 4673 "PhotoMetadata.c"
 	}
 #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 4665 "PhotoMetadata.c"
+#line 4677 "PhotoMetadata.c"
 }
 
 
@@ -4672,7 +4684,7 @@ static Block2Data* block2_data_ref (Block2Data* _data2_) {
 	g_atomic_int_inc (&_data2_->_ref_count_);
 #line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return _data2_;
-#line 4674 "PhotoMetadata.c"
+#line 4686 "PhotoMetadata.c"
 }
 
 
@@ -4681,7 +4693,7 @@ static void block2_data_unref (void * _userdata_) {
 	_data2_ = (Block2Data*) _userdata_;
 #line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) {
-#line 4683 "PhotoMetadata.c"
+#line 4695 "PhotoMetadata.c"
 		PhotoMetadata* self;
 #line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		self = _data2_->self;
@@ -4691,7 +4703,7 @@ static void block2_data_unref (void * _userdata_) {
 		_media_metadata_unref0 (self);
 #line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_slice_free (Block2Data, _data2_);
-#line 4693 "PhotoMetadata.c"
+#line 4705 "PhotoMetadata.c"
 	}
 }
 
@@ -4710,14 +4722,14 @@ static void __lambda6_ (Block2Data* _data2_, const gchar* tag) {
 	_tmp1_ = _data2_->values;
 #line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_string_multiple (self, _tmp0_, _tmp1_);
-#line 4712 "PhotoMetadata.c"
+#line 4724 "PhotoMetadata.c"
 }
 
 
 static void ___lambda6__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
 #line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	__lambda6_ (self, tag);
-#line 4719 "PhotoMetadata.c"
+#line 4731 "PhotoMetadata.c"
 }
 
 
@@ -4758,7 +4770,7 @@ void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags,
 	block2_data_unref (_data2_);
 #line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data2_ = NULL;
-#line 4760 "PhotoMetadata.c"
+#line 4772 "PhotoMetadata.c"
 }
 
 
@@ -4788,11 +4800,11 @@ gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong*
 		if (value) {
 #line 575 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*value = _vala_value;
-#line 4790 "PhotoMetadata.c"
+#line 4802 "PhotoMetadata.c"
 		}
 #line 575 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 4794 "PhotoMetadata.c"
+#line 4806 "PhotoMetadata.c"
 	}
 #line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = self->priv->exiv2;
@@ -4808,11 +4820,11 @@ gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong*
 	if (value) {
 #line 580 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*value = _vala_value;
-#line 4810 "PhotoMetadata.c"
+#line 4822 "PhotoMetadata.c"
 	}
 #line 580 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 4814 "PhotoMetadata.c"
+#line 4826 "PhotoMetadata.c"
 }
 
 
@@ -4827,7 +4839,7 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
 	_tmp0_ = tags;
 #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 4829 "PhotoMetadata.c"
+#line 4841 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -4839,14 +4851,14 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
 		tag_collection_length1 = _tmp0__length1;
 #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 4841 "PhotoMetadata.c"
+#line 4853 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
 #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
 #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 4848 "PhotoMetadata.c"
+#line 4860 "PhotoMetadata.c"
 			{
 				const gchar* _tmp2_ = NULL;
 				glong _tmp3_ = 0L;
@@ -4867,15 +4879,15 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
 					if (value) {
 #line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						*value = _vala_value;
-#line 4869 "PhotoMetadata.c"
+#line 4881 "PhotoMetadata.c"
 					}
 #line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 4873 "PhotoMetadata.c"
+#line 4885 "PhotoMetadata.c"
 				}
 #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 4877 "PhotoMetadata.c"
+#line 4889 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -4887,11 +4899,11 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
 	if (value) {
 #line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*value = _vala_value;
-#line 4889 "PhotoMetadata.c"
+#line 4901 "PhotoMetadata.c"
 	}
 #line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 4893 "PhotoMetadata.c"
+#line 4905 "PhotoMetadata.c"
 }
 
 
@@ -4914,7 +4926,7 @@ void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value
 	_tmp3_ = gexiv2_metadata_set_tag_long (_tmp0_, _tmp1_, _tmp2_);
 #line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp3_) {
-#line 4916 "PhotoMetadata.c"
+#line 4928 "PhotoMetadata.c"
 		const gchar* _tmp4_ = NULL;
 		glong _tmp5_ = 0L;
 		const gchar* _tmp6_ = NULL;
@@ -4927,7 +4939,7 @@ void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value
 #line 596 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_warning ("PhotoMetadata.vala:596: Unable to set tag %s to long %ld from source %" \
 "s", _tmp4_, _tmp5_, _tmp6_);
-#line 4928 "PhotoMetadata.c"
+#line 4940 "PhotoMetadata.c"
 	}
 }
 
@@ -4937,7 +4949,7 @@ static Block3Data* block3_data_ref (Block3Data* _data3_) {
 	g_atomic_int_inc (&_data3_->_ref_count_);
 #line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return _data3_;
-#line 4938 "PhotoMetadata.c"
+#line 4950 "PhotoMetadata.c"
 }
 
 
@@ -4946,7 +4958,7 @@ static void block3_data_unref (void * _userdata_) {
 	_data3_ = (Block3Data*) _userdata_;
 #line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) {
-#line 4947 "PhotoMetadata.c"
+#line 4959 "PhotoMetadata.c"
 		PhotoMetadata* self;
 #line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		self = _data3_->self;
@@ -4954,7 +4966,7 @@ static void block3_data_unref (void * _userdata_) {
 		_media_metadata_unref0 (self);
 #line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_slice_free (Block3Data, _data3_);
-#line 4955 "PhotoMetadata.c"
+#line 4967 "PhotoMetadata.c"
 	}
 }
 
@@ -4973,14 +4985,14 @@ static void __lambda7_ (Block3Data* _data3_, const gchar* tag) {
 	_tmp1_ = _data3_->value;
 #line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_long (self, _tmp0_, _tmp1_);
-#line 4974 "PhotoMetadata.c"
+#line 4986 "PhotoMetadata.c"
 }
 
 
 static void ___lambda7__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
 #line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	__lambda7_ (self, tag);
-#line 4981 "PhotoMetadata.c"
+#line 4993 "PhotoMetadata.c"
 }
 
 
@@ -5014,7 +5026,7 @@ void photo_metadata_set_all_long (PhotoMetadata* self, gchar** tags, int tags_le
 	block3_data_unref (_data3_);
 #line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data3_ = NULL;
-#line 5015 "PhotoMetadata.c"
+#line 5027 "PhotoMetadata.c"
 }
 
 
@@ -5053,11 +5065,11 @@ gboolean photo_metadata_get_rational (PhotoMetadata* self, const gchar* tag, Met
 	if (rational) {
 #line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*rational = _vala_rational;
-#line 5054 "PhotoMetadata.c"
+#line 5066 "PhotoMetadata.c"
 	}
 #line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5058 "PhotoMetadata.c"
+#line 5070 "PhotoMetadata.c"
 }
 
 
@@ -5072,7 +5084,7 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
 	_tmp0_ = tags;
 #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 5073 "PhotoMetadata.c"
+#line 5085 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -5084,14 +5096,14 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
 		tag_collection_length1 = _tmp0__length1;
 #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 5085 "PhotoMetadata.c"
+#line 5097 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
 #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
 #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 5092 "PhotoMetadata.c"
+#line 5104 "PhotoMetadata.c"
 			{
 				const gchar* _tmp2_ = NULL;
 				MetadataRational _tmp3_ = {0};
@@ -5112,15 +5124,15 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
 					if (rational) {
 #line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						*rational = _vala_rational;
-#line 5113 "PhotoMetadata.c"
+#line 5125 "PhotoMetadata.c"
 					}
 #line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 5117 "PhotoMetadata.c"
+#line 5129 "PhotoMetadata.c"
 				}
 #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 5121 "PhotoMetadata.c"
+#line 5133 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -5132,11 +5144,11 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
 	if (rational) {
 #line 620 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*rational = _vala_rational;
-#line 5133 "PhotoMetadata.c"
+#line 5145 "PhotoMetadata.c"
 	}
 #line 620 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5137 "PhotoMetadata.c"
+#line 5149 "PhotoMetadata.c"
 }
 
 
@@ -5170,7 +5182,7 @@ void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, Metadat
 	_tmp6_ = gexiv2_metadata_set_exif_tag_rational (_tmp0_, _tmp1_, _tmp3_, _tmp5_);
 #line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp6_) {
-#line 5171 "PhotoMetadata.c"
+#line 5183 "PhotoMetadata.c"
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
@@ -5188,7 +5200,7 @@ void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, Metadat
 "e %s", _tmp7_, _tmp9_, _tmp10_);
 #line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_tmp9_);
-#line 5188 "PhotoMetadata.c"
+#line 5200 "PhotoMetadata.c"
 	}
 }
 
@@ -5198,7 +5210,7 @@ static Block4Data* block4_data_ref (Block4Data* _data4_) {
 	g_atomic_int_inc (&_data4_->_ref_count_);
 #line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return _data4_;
-#line 5198 "PhotoMetadata.c"
+#line 5210 "PhotoMetadata.c"
 }
 
 
@@ -5207,7 +5219,7 @@ static void block4_data_unref (void * _userdata_) {
 	_data4_ = (Block4Data*) _userdata_;
 #line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) {
-#line 5207 "PhotoMetadata.c"
+#line 5219 "PhotoMetadata.c"
 		PhotoMetadata* self;
 #line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		self = _data4_->self;
@@ -5215,7 +5227,7 @@ static void block4_data_unref (void * _userdata_) {
 		_media_metadata_unref0 (self);
 #line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_slice_free (Block4Data, _data4_);
-#line 5215 "PhotoMetadata.c"
+#line 5227 "PhotoMetadata.c"
 	}
 }
 
@@ -5234,14 +5246,14 @@ static void __lambda8_ (Block4Data* _data4_, const gchar* tag) {
 	_tmp1_ = _data4_->rational;
 #line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_rational (self, _tmp0_, &_tmp1_);
-#line 5234 "PhotoMetadata.c"
+#line 5246 "PhotoMetadata.c"
 }
 
 
 static void ___lambda8__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
 #line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	__lambda8_ (self, tag);
-#line 5241 "PhotoMetadata.c"
+#line 5253 "PhotoMetadata.c"
 }
 
 
@@ -5277,7 +5289,7 @@ void photo_metadata_set_all_rational (PhotoMetadata* self, gchar** tags, int tag
 	block4_data_unref (_data4_);
 #line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data4_ = NULL;
-#line 5277 "PhotoMetadata.c"
+#line 5289 "PhotoMetadata.c"
 }
 
 
@@ -5308,7 +5320,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 		_g_free0 (value);
 #line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 5308 "PhotoMetadata.c"
+#line 5320 "PhotoMetadata.c"
 	}
 	{
 		const gchar* _tmp3_ = NULL;
@@ -5321,7 +5333,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 		switch (_tmp4_) {
 #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			case METADATA_DOMAIN_XMP:
-#line 5321 "PhotoMetadata.c"
+#line 5333 "PhotoMetadata.c"
 			{
 				MetadataDateTime* _tmp5_ = NULL;
 				const gchar* _tmp6_ = NULL;
@@ -5335,7 +5347,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 				_tmp5_ = _tmp7_;
 #line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5335 "PhotoMetadata.c"
+#line 5347 "PhotoMetadata.c"
 					goto __catch26_g_error;
 				}
 #line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5350,11 +5362,11 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 				_g_free0 (value);
 #line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				return result;
-#line 5350 "PhotoMetadata.c"
+#line 5362 "PhotoMetadata.c"
 			}
 #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			case METADATA_DOMAIN_IPTC:
-#line 5354 "PhotoMetadata.c"
+#line 5366 "PhotoMetadata.c"
 			{
 #line 647 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				result = NULL;
@@ -5362,12 +5374,12 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 				_g_free0 (value);
 #line 647 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				return result;
-#line 5362 "PhotoMetadata.c"
+#line 5374 "PhotoMetadata.c"
 			}
 			default:
 #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			case METADATA_DOMAIN_EXIF:
-#line 5367 "PhotoMetadata.c"
+#line 5379 "PhotoMetadata.c"
 			{
 				MetadataDateTime* _tmp9_ = NULL;
 				const gchar* _tmp10_ = NULL;
@@ -5381,7 +5393,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 				_tmp9_ = _tmp11_;
 #line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5381 "PhotoMetadata.c"
+#line 5393 "PhotoMetadata.c"
 					goto __catch26_g_error;
 				}
 #line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5396,7 +5408,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 				_g_free0 (value);
 #line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				return result;
-#line 5396 "PhotoMetadata.c"
+#line 5408 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -5430,7 +5442,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 		_g_free0 (value);
 #line 656 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 5430 "PhotoMetadata.c"
+#line 5442 "PhotoMetadata.c"
 	}
 	__finally26:
 #line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5441,7 +5453,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 	g_clear_error (&_inner_error_);
 #line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 5441 "PhotoMetadata.c"
+#line 5453 "PhotoMetadata.c"
 }
 
 
@@ -5455,7 +5467,7 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
 	_tmp0_ = tags;
 #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 5455 "PhotoMetadata.c"
+#line 5467 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -5467,14 +5479,14 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
 		tag_collection_length1 = _tmp0__length1;
 #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 5467 "PhotoMetadata.c"
+#line 5479 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
 #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
 #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 5474 "PhotoMetadata.c"
+#line 5486 "PhotoMetadata.c"
 			{
 				MetadataDateTime* date_time = NULL;
 				const gchar* _tmp2_ = NULL;
@@ -5496,13 +5508,13 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
 					_g_free0 (tag);
 #line 664 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 5496 "PhotoMetadata.c"
+#line 5508 "PhotoMetadata.c"
 				}
 #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_metadata_date_time_unref0 (date_time);
 #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 5502 "PhotoMetadata.c"
+#line 5514 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -5510,7 +5522,7 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
 	result = NULL;
 #line 667 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5510 "PhotoMetadata.c"
+#line 5522 "PhotoMetadata.c"
 }
 
 
@@ -5531,7 +5543,7 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
 	switch (_tmp1_) {
 #line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_EXIF:
-#line 5531 "PhotoMetadata.c"
+#line 5543 "PhotoMetadata.c"
 		{
 			const gchar* _tmp2_ = NULL;
 			MetadataDateTime* _tmp3_ = NULL;
@@ -5551,11 +5563,11 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
 			_g_free0 (_tmp5_);
 #line 674 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 5551 "PhotoMetadata.c"
+#line 5563 "PhotoMetadata.c"
 		}
 #line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_XMP:
-#line 5555 "PhotoMetadata.c"
+#line 5567 "PhotoMetadata.c"
 		{
 			const gchar* _tmp6_ = NULL;
 			MetadataDateTime* _tmp7_ = NULL;
@@ -5575,12 +5587,12 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
 			_g_free0 (_tmp9_);
 #line 678 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 5575 "PhotoMetadata.c"
+#line 5587 "PhotoMetadata.c"
 		}
 		default:
 #line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_IPTC:
-#line 5580 "PhotoMetadata.c"
+#line 5592 "PhotoMetadata.c"
 		{
 			const gchar* _tmp10_ = NULL;
 			const gchar* _tmp11_ = NULL;
@@ -5602,7 +5614,7 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
 "supported metadata domain %s", _tmp10_, _tmp11_, (_tmp14_ != NULL) ? _tmp14_->value_name : NULL);
 #line 685 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 5601 "PhotoMetadata.c"
+#line 5613 "PhotoMetadata.c"
 		}
 	}
 }
@@ -5611,7 +5623,7 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
 static gpointer _metadata_date_time_ref0 (gpointer self) {
 #line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self ? metadata_date_time_ref (self) : NULL;
-#line 5610 "PhotoMetadata.c"
+#line 5622 "PhotoMetadata.c"
 }
 
 
@@ -5620,7 +5632,7 @@ static Block5Data* block5_data_ref (Block5Data* _data5_) {
 	g_atomic_int_inc (&_data5_->_ref_count_);
 #line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return _data5_;
-#line 5619 "PhotoMetadata.c"
+#line 5631 "PhotoMetadata.c"
 }
 
 
@@ -5629,7 +5641,7 @@ static void block5_data_unref (void * _userdata_) {
 	_data5_ = (Block5Data*) _userdata_;
 #line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&_data5_->_ref_count_)) {
-#line 5628 "PhotoMetadata.c"
+#line 5640 "PhotoMetadata.c"
 		PhotoMetadata* self;
 #line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		self = _data5_->self;
@@ -5639,7 +5651,7 @@ static void block5_data_unref (void * _userdata_) {
 		_media_metadata_unref0 (self);
 #line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_slice_free (Block5Data, _data5_);
-#line 5638 "PhotoMetadata.c"
+#line 5650 "PhotoMetadata.c"
 	}
 }
 
@@ -5658,14 +5670,14 @@ static void __lambda9_ (Block5Data* _data5_, const gchar* tag) {
 	_tmp1_ = _data5_->date_time;
 #line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_date_time (self, _tmp0_, _tmp1_);
-#line 5657 "PhotoMetadata.c"
+#line 5669 "PhotoMetadata.c"
 }
 
 
 static void ___lambda9__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
 #line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	__lambda9_ (self, tag);
-#line 5664 "PhotoMetadata.c"
+#line 5676 "PhotoMetadata.c"
 }
 
 
@@ -5706,7 +5718,7 @@ void photo_metadata_set_all_date_time (PhotoMetadata* self, gchar** tags, int ta
 	block5_data_unref (_data5_);
 #line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data5_ = NULL;
-#line 5705 "PhotoMetadata.c"
+#line 5717 "PhotoMetadata.c"
 }
 
 
@@ -5740,7 +5752,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
 	_tmp0_ = self->priv->exif;
 #line 695 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ == NULL) {
-#line 5739 "PhotoMetadata.c"
+#line 5751 "PhotoMetadata.c"
 		guint8* _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
 #line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5751,13 +5763,13 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
 		if (result_length1) {
 #line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*result_length1 = _tmp1__length1;
-#line 5750 "PhotoMetadata.c"
+#line 5762 "PhotoMetadata.c"
 		}
 #line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = _tmp1_;
 #line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 5756 "PhotoMetadata.c"
+#line 5768 "PhotoMetadata.c"
 	}
 #line 700 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = self->priv->exif;
@@ -5775,7 +5787,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
 	_tmp6_ = include_preview;
 #line 702 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp6_) {
-#line 5774 "PhotoMetadata.c"
+#line 5786 "PhotoMetadata.c"
 		ExifData* _tmp7_ = NULL;
 		ExifData* _tmp8_ = NULL;
 #line 703 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5786,7 +5798,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
 		_tmp8_ = self->priv->exif;
 #line 704 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp8_->size = (guint) 0;
-#line 5785 "PhotoMetadata.c"
+#line 5797 "PhotoMetadata.c"
 	}
 #line 707 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	flattened = NULL;
@@ -5806,21 +5818,21 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
 	_tmp11_ = saved_size;
 #line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp11_ > ((guint) 0)) {
-#line 5805 "PhotoMetadata.c"
+#line 5817 "PhotoMetadata.c"
 		guchar* _tmp12_ = NULL;
 #line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp12_ = saved_data;
 #line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = _tmp12_ != NULL;
-#line 5811 "PhotoMetadata.c"
+#line 5823 "PhotoMetadata.c"
 	} else {
 #line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = FALSE;
-#line 5815 "PhotoMetadata.c"
+#line 5827 "PhotoMetadata.c"
 	}
 #line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp10_) {
-#line 5819 "PhotoMetadata.c"
+#line 5831 "PhotoMetadata.c"
 		guint _tmp13_ = 0U;
 		guint8* _tmp14_ = NULL;
 		guint8* _tmp15_ = NULL;
@@ -5862,7 +5874,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
 		exif_mem_free (_tmp19_, _tmp20_);
 #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_exif_mem_unref0 (_tmp19_);
-#line 5861 "PhotoMetadata.c"
+#line 5873 "PhotoMetadata.c"
 	}
 #line 721 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp21_ = self->priv->exif;
@@ -5884,20 +5896,20 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
 	if (result_length1) {
 #line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*result_length1 = _tmp25__length1;
-#line 5883 "PhotoMetadata.c"
+#line 5895 "PhotoMetadata.c"
 	}
 #line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp25_;
 #line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5889 "PhotoMetadata.c"
+#line 5901 "PhotoMetadata.c"
 }
 
 
 static guint8* _vala_array_dup5 (guint8* self, int length) {
 #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 5896 "PhotoMetadata.c"
+#line 5908 "PhotoMetadata.c"
 }
 
 
@@ -5933,7 +5945,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
 	_buffer_size_ = buffer_length1;
 #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_) {
-#line 5932 "PhotoMetadata.c"
+#line 5944 "PhotoMetadata.c"
 		guchar* _tmp5_ = NULL;
 		gint _tmp5__length1 = 0;
 #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5946,7 +5958,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
 		_tmp0__length1 = _tmp5__length1;
 #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		__tmp0__size_ = _tmp0__length1;
-#line 5945 "PhotoMetadata.c"
+#line 5957 "PhotoMetadata.c"
 	} else {
 #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp0_ = NULL;
@@ -5954,7 +5966,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
 		_tmp0__length1 = 0;
 #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		__tmp0__size_ = _tmp0__length1;
-#line 5953 "PhotoMetadata.c"
+#line 5965 "PhotoMetadata.c"
 	}
 #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = (_tmp0_ != NULL) ? _vala_array_dup5 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
@@ -5968,7 +5980,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
 	if (result_length1) {
 #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*result_length1 = _tmp7__length1;
-#line 5967 "PhotoMetadata.c"
+#line 5979 "PhotoMetadata.c"
 	}
 #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp7_;
@@ -5976,7 +5988,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
 	buffer = (g_free (buffer), NULL);
 #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5975 "PhotoMetadata.c"
+#line 5987 "PhotoMetadata.c"
 }
 
 
@@ -6009,7 +6021,7 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) {
 	_tmp4__length1 = props_length1;
 #line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_ != NULL) {
-#line 6008 "PhotoMetadata.c"
+#line 6020 "PhotoMetadata.c"
 		GExiv2PreviewProperties** _tmp5_ = NULL;
 		gint _tmp5__length1 = 0;
 #line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6018,17 +6030,17 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) {
 		_tmp5__length1 = props_length1;
 #line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = _tmp5__length1;
-#line 6017 "PhotoMetadata.c"
+#line 6029 "PhotoMetadata.c"
 	} else {
 #line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = 0;
-#line 6021 "PhotoMetadata.c"
+#line 6033 "PhotoMetadata.c"
 	}
 #line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = (guint) _tmp3_;
 #line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6027 "PhotoMetadata.c"
+#line 6039 "PhotoMetadata.c"
 }
 
 
@@ -6070,7 +6082,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
 	if (_tmp4_ == NULL) {
 #line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = TRUE;
-#line 6069 "PhotoMetadata.c"
+#line 6081 "PhotoMetadata.c"
 	} else {
 		GExiv2PreviewProperties** _tmp5_ = NULL;
 		gint _tmp5__length1 = 0;
@@ -6083,7 +6095,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
 		_tmp6_ = number;
 #line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = ((guint) _tmp5__length1) <= _tmp6_;
-#line 6082 "PhotoMetadata.c"
+#line 6094 "PhotoMetadata.c"
 	}
 #line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
@@ -6091,7 +6103,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
 		result = NULL;
 #line 743 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 6090 "PhotoMetadata.c"
+#line 6102 "PhotoMetadata.c"
 	}
 #line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = self->priv->source_name;
@@ -6111,7 +6123,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_PREVIEW, PhotoPreview);
 #line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6110 "PhotoMetadata.c"
+#line 6122 "PhotoMetadata.c"
 }
 
 
@@ -6128,7 +6140,7 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) {
 	_tmp1_ = self->priv->exif;
 #line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp1_ != NULL) {
-#line 6127 "PhotoMetadata.c"
+#line 6139 "PhotoMetadata.c"
 		ExifMem* _tmp2_ = NULL;
 		ExifMem* _tmp3_ = NULL;
 		ExifData* _tmp4_ = NULL;
@@ -6155,7 +6167,7 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) {
 		_tmp7_ = self->priv->exif;
 #line 753 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_->size = (guint) 0;
-#line 6154 "PhotoMetadata.c"
+#line 6166 "PhotoMetadata.c"
 	}
 }
 
@@ -6173,7 +6185,7 @@ void photo_metadata_remove_tag (PhotoMetadata* self, const gchar* tag) {
 	_tmp1_ = tag;
 #line 758 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_clear_tag (_tmp0_, _tmp1_);
-#line 6172 "PhotoMetadata.c"
+#line 6184 "PhotoMetadata.c"
 }
 
 
@@ -6186,7 +6198,7 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len
 	_tmp0_ = tags;
 #line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 6185 "PhotoMetadata.c"
+#line 6197 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -6198,14 +6210,14 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len
 		tag_collection_length1 = _tmp0__length1;
 #line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 6197 "PhotoMetadata.c"
+#line 6209 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
 #line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
 #line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 6204 "PhotoMetadata.c"
+#line 6216 "PhotoMetadata.c"
 			{
 				const gchar* _tmp2_ = NULL;
 #line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6214,7 +6226,7 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len
 				photo_metadata_remove_tag (self, _tmp2_);
 #line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 6213 "PhotoMetadata.c"
+#line 6225 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -6231,7 +6243,7 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
 	switch (_tmp0_) {
 #line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_EXIF:
-#line 6230 "PhotoMetadata.c"
+#line 6242 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp1_ = NULL;
 #line 769 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6240,11 +6252,11 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
 			gexiv2_metadata_clear_exif (_tmp1_);
 #line 770 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 6239 "PhotoMetadata.c"
+#line 6251 "PhotoMetadata.c"
 		}
 #line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_XMP:
-#line 6243 "PhotoMetadata.c"
+#line 6255 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp2_ = NULL;
 #line 773 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6253,11 +6265,11 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
 			gexiv2_metadata_clear_xmp (_tmp2_);
 #line 774 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 6252 "PhotoMetadata.c"
+#line 6264 "PhotoMetadata.c"
 		}
 #line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_IPTC:
-#line 6256 "PhotoMetadata.c"
+#line 6268 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp3_ = NULL;
 #line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6266,12 +6278,12 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
 			gexiv2_metadata_clear_iptc (_tmp3_);
 #line 778 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 6265 "PhotoMetadata.c"
+#line 6277 "PhotoMetadata.c"
 		}
 		default:
 #line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		break;
-#line 6270 "PhotoMetadata.c"
+#line 6282 "PhotoMetadata.c"
 	}
 }
 
@@ -6284,7 +6296,7 @@ void photo_metadata_clear (PhotoMetadata* self) {
 	_tmp0_ = self->priv->exiv2;
 #line 783 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_clear (_tmp0_);
-#line 6283 "PhotoMetadata.c"
+#line 6295 "PhotoMetadata.c"
 }
 
 
@@ -6305,7 +6317,7 @@ MetadataDateTime* photo_metadata_get_modification_date_time (PhotoMetadata* self
 	result = _tmp1_;
 #line 794 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6304 "PhotoMetadata.c"
+#line 6316 "PhotoMetadata.c"
 }
 
 
@@ -6319,7 +6331,7 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat
 	_tmp0_ = date_time;
 #line 799 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ != NULL) {
-#line 6318 "PhotoMetadata.c"
+#line 6330 "PhotoMetadata.c"
 		gchar** _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
 		MetadataDateTime* _tmp2_ = NULL;
@@ -6334,7 +6346,7 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat
 		_tmp3_ = option;
 #line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
-#line 6333 "PhotoMetadata.c"
+#line 6345 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
@@ -6344,7 +6356,7 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat
 		_tmp4__length1 = photo_metadata_DATE_TIME_TAGS_length1;
 #line 802 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1);
-#line 6343 "PhotoMetadata.c"
+#line 6355 "PhotoMetadata.c"
 	}
 }
 
@@ -6366,7 +6378,7 @@ MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self) {
 	result = _tmp1_;
 #line 815 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6365 "PhotoMetadata.c"
+#line 6377 "PhotoMetadata.c"
 }
 
 
@@ -6380,7 +6392,7 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim
 	_tmp0_ = date_time;
 #line 820 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ != NULL) {
-#line 6379 "PhotoMetadata.c"
+#line 6391 "PhotoMetadata.c"
 		gchar** _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
 		MetadataDateTime* _tmp2_ = NULL;
@@ -6395,7 +6407,7 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim
 		_tmp3_ = option;
 #line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
-#line 6394 "PhotoMetadata.c"
+#line 6406 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
@@ -6405,7 +6417,7 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim
 		_tmp4__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1;
 #line 823 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1);
-#line 6404 "PhotoMetadata.c"
+#line 6416 "PhotoMetadata.c"
 	}
 }
 
@@ -6427,7 +6439,7 @@ MetadataDateTime* photo_metadata_get_digitized_date_time (PhotoMetadata* self) {
 	result = _tmp1_;
 #line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6426 "PhotoMetadata.c"
+#line 6438 "PhotoMetadata.c"
 }
 
 
@@ -6441,7 +6453,7 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi
 	_tmp0_ = date_time;
 #line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ != NULL) {
-#line 6440 "PhotoMetadata.c"
+#line 6452 "PhotoMetadata.c"
 		gchar** _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
 		MetadataDateTime* _tmp2_ = NULL;
@@ -6456,7 +6468,7 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi
 		_tmp3_ = option;
 #line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
-#line 6455 "PhotoMetadata.c"
+#line 6467 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
@@ -6466,7 +6478,7 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi
 		_tmp4__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1;
 #line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1);
-#line 6465 "PhotoMetadata.c"
+#line 6477 "PhotoMetadata.c"
 	}
 }
 
@@ -6487,7 +6499,7 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada
 	_tmp1_ = creation;
 #line 845 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp1_ == NULL) {
-#line 6486 "PhotoMetadata.c"
+#line 6498 "PhotoMetadata.c"
 		MetadataDateTime* _tmp2_ = NULL;
 #line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = photo_metadata_get_digitized_date_time (self);
@@ -6495,20 +6507,20 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada
 		_metadata_date_time_unref0 (creation);
 #line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		creation = _tmp2_;
-#line 6494 "PhotoMetadata.c"
+#line 6506 "PhotoMetadata.c"
 	}
 #line 848 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = creation;
 #line 848 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6500 "PhotoMetadata.c"
+#line 6512 "PhotoMetadata.c"
 }
 
 
 static gpointer _dimensions_dup0 (gpointer self) {
 #line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self ? dimensions_dup (self) : NULL;
-#line 6507 "PhotoMetadata.c"
+#line 6519 "PhotoMetadata.c"
 }
 
 
@@ -6530,19 +6542,19 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
 	_tmp1__length1 = photo_metadata_HEIGHT_TAGS_length1;
 #line 867 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_assert (_tmp0__length1 == _tmp1__length1, "WIDTH_TAGS.length == HEIGHT_TAGS.length");
-#line 6529 "PhotoMetadata.c"
+#line 6541 "PhotoMetadata.c"
 	{
 		gint ctr = 0;
 #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		ctr = 0;
-#line 6534 "PhotoMetadata.c"
+#line 6546 "PhotoMetadata.c"
 		{
 			gboolean _tmp2_ = FALSE;
 #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp2_ = TRUE;
 #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			while (TRUE) {
-#line 6541 "PhotoMetadata.c"
+#line 6553 "PhotoMetadata.c"
 				gint _tmp4_ = 0;
 				gchar** _tmp5_ = NULL;
 				gint _tmp5__length1 = 0;
@@ -6566,13 +6578,13 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
 				Dimensions* _tmp19_ = NULL;
 #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!_tmp2_) {
-#line 6565 "PhotoMetadata.c"
+#line 6577 "PhotoMetadata.c"
 					gint _tmp3_ = 0;
 #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp3_ = ctr;
 #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					ctr = _tmp3_ + 1;
-#line 6571 "PhotoMetadata.c"
+#line 6583 "PhotoMetadata.c"
 				}
 #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = FALSE;
@@ -6586,7 +6598,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
 				if (!(_tmp4_ < _tmp5__length1)) {
 #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					break;
-#line 6585 "PhotoMetadata.c"
+#line 6597 "PhotoMetadata.c"
 				}
 #line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp6_ = photo_metadata_WIDTH_TAGS;
@@ -6604,7 +6616,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
 				if (!_tmp10_) {
 #line 873 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					continue;
-#line 6603 "PhotoMetadata.c"
+#line 6615 "PhotoMetadata.c"
 				}
 #line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp11_ = photo_metadata_HEIGHT_TAGS;
@@ -6622,7 +6634,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
 				if (!_tmp15_) {
 #line 877 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					continue;
-#line 6621 "PhotoMetadata.c"
+#line 6633 "PhotoMetadata.c"
 				}
 #line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp16_ = width;
@@ -6636,7 +6648,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
 				result = _tmp19_;
 #line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				return result;
-#line 6635 "PhotoMetadata.c"
+#line 6647 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -6644,7 +6656,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
 	result = NULL;
 #line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6643 "PhotoMetadata.c"
+#line 6655 "PhotoMetadata.c"
 }
 
 
@@ -6656,7 +6668,7 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim,
 	_tmp0_ = dim;
 #line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ != NULL) {
-#line 6655 "PhotoMetadata.c"
+#line 6667 "PhotoMetadata.c"
 		gchar** _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
 		Dimensions* _tmp2_ = NULL;
@@ -6691,7 +6703,7 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim,
 		_tmp8_ = option;
 #line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_long (self, _tmp5_, _tmp5__length1, (glong) _tmp7_, _tmp8_);
-#line 6690 "PhotoMetadata.c"
+#line 6702 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp9_ = NULL;
 		gint _tmp9__length1 = 0;
@@ -6709,7 +6721,7 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim,
 		_tmp10__length1 = photo_metadata_HEIGHT_TAGS_length1;
 #line 891 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp10_, _tmp10__length1);
-#line 6708 "PhotoMetadata.c"
+#line 6720 "PhotoMetadata.c"
 	}
 }
 
@@ -6733,7 +6745,7 @@ static gchar* string_strip (const gchar* self) {
 	result = _result_;
 #line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 6732 "PhotoMetadata.c"
+#line 6744 "PhotoMetadata.c"
 }
 
 
@@ -6753,7 +6765,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 6752 "PhotoMetadata.c"
+#line 6764 "PhotoMetadata.c"
 }
 
 
@@ -6782,7 +6794,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 	_tmp1_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
 #line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp1_) {
-#line 6781 "PhotoMetadata.c"
+#line 6793 "PhotoMetadata.c"
 		GeeList* _tmp2_ = NULL;
 #line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = photo_metadata_get_string_multiple (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
@@ -6790,7 +6802,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 		_g_object_unref0 (_tmp0_);
 #line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp0_ = _tmp2_;
-#line 6789 "PhotoMetadata.c"
+#line 6801 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp3_ = NULL;
 		gint _tmp3__length1 = 0;
@@ -6805,7 +6817,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 		_g_object_unref0 (_tmp0_);
 #line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp0_ = _tmp4_;
-#line 6804 "PhotoMetadata.c"
+#line 6816 "PhotoMetadata.c"
 	}
 #line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = _g_object_ref0 (_tmp0_);
@@ -6815,7 +6827,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 	_tmp8_ = titles;
 #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp8_ != NULL) {
-#line 6814 "PhotoMetadata.c"
+#line 6826 "PhotoMetadata.c"
 		GeeList* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
 		gint _tmp11_ = 0;
@@ -6827,15 +6839,15 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 		_tmp11_ = _tmp10_;
 #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = _tmp11_ > 0;
-#line 6826 "PhotoMetadata.c"
+#line 6838 "PhotoMetadata.c"
 	} else {
 #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = FALSE;
-#line 6830 "PhotoMetadata.c"
+#line 6842 "PhotoMetadata.c"
 	}
 #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp7_) {
-#line 6834 "PhotoMetadata.c"
+#line 6846 "PhotoMetadata.c"
 		GeeList* _tmp12_ = NULL;
 		gpointer _tmp13_ = NULL;
 #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6846,13 +6858,13 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 		_g_free0 (_tmp6_);
 #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = (gchar*) _tmp13_;
-#line 6845 "PhotoMetadata.c"
+#line 6857 "PhotoMetadata.c"
 	} else {
 #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_tmp6_);
 #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = NULL;
-#line 6851 "PhotoMetadata.c"
+#line 6863 "PhotoMetadata.c"
 	}
 #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp14_ = g_strdup (_tmp6_);
@@ -6862,7 +6874,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 	_tmp15_ = title;
 #line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp15_ != NULL) {
-#line 6861 "PhotoMetadata.c"
+#line 6873 "PhotoMetadata.c"
 		const gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
 #line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6873,7 +6885,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 		_g_free0 (title);
 #line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		title = _tmp17_;
-#line 6872 "PhotoMetadata.c"
+#line 6884 "PhotoMetadata.c"
 	}
 #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp21_ = title;
@@ -6881,7 +6893,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 	_tmp22_ = is_string_empty (_tmp21_);
 #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp22_) {
-#line 6880 "PhotoMetadata.c"
+#line 6892 "PhotoMetadata.c"
 		const gchar* _tmp23_ = NULL;
 		gboolean _tmp24_ = FALSE;
 #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6890,15 +6902,15 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 		_tmp24_ = string_contains (_tmp23_, "\n");
 #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp20_ = !_tmp24_;
-#line 6889 "PhotoMetadata.c"
+#line 6901 "PhotoMetadata.c"
 	} else {
 #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp20_ = FALSE;
-#line 6893 "PhotoMetadata.c"
+#line 6905 "PhotoMetadata.c"
 	}
 #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp20_) {
-#line 6897 "PhotoMetadata.c"
+#line 6909 "PhotoMetadata.c"
 		const gchar* _tmp25_ = NULL;
 		gboolean _tmp26_ = FALSE;
 #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6907,25 +6919,25 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 		_tmp26_ = string_contains (_tmp25_, "\r");
 #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp19_ = !_tmp26_;
-#line 6906 "PhotoMetadata.c"
+#line 6918 "PhotoMetadata.c"
 	} else {
 #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp19_ = FALSE;
-#line 6910 "PhotoMetadata.c"
+#line 6922 "PhotoMetadata.c"
 	}
 #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp19_) {
-#line 6914 "PhotoMetadata.c"
+#line 6926 "PhotoMetadata.c"
 		const gchar* _tmp27_ = NULL;
 #line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp27_ = title;
 #line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp18_ = _tmp27_;
-#line 6920 "PhotoMetadata.c"
+#line 6932 "PhotoMetadata.c"
 	} else {
 #line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp18_ = NULL;
-#line 6924 "PhotoMetadata.c"
+#line 6936 "PhotoMetadata.c"
 	}
 #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp28_ = g_strdup (_tmp18_);
@@ -6941,7 +6953,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 	_g_object_unref0 (_tmp0_);
 #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6940 "PhotoMetadata.c"
+#line 6952 "PhotoMetadata.c"
 }
 
 
@@ -6956,19 +6968,19 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet
 	_tmp1_ = is_string_empty (_tmp0_);
 #line 952 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp1_) {
-#line 6955 "PhotoMetadata.c"
+#line 6967 "PhotoMetadata.c"
 		gboolean _tmp2_ = FALSE;
 #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 6961 "PhotoMetadata.c"
+#line 6973 "PhotoMetadata.c"
 			const gchar* _tmp3_ = NULL;
 #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 6967 "PhotoMetadata.c"
+#line 6979 "PhotoMetadata.c"
 		} else {
 			gchar** _tmp4_ = NULL;
 			gint _tmp4__length1 = 0;
@@ -6984,7 +6996,7 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet
 			_tmp6_ = option;
 #line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			photo_metadata_set_all_string (self, _tmp4_, _tmp4__length1, _tmp5_, _tmp6_);
-#line 6983 "PhotoMetadata.c"
+#line 6995 "PhotoMetadata.c"
 		}
 	} else {
 		gchar** _tmp7_ = NULL;
@@ -6995,7 +7007,7 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet
 		_tmp7__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1;
 #line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp7_, _tmp7__length1);
-#line 6994 "PhotoMetadata.c"
+#line 7006 "PhotoMetadata.c"
 	}
 }
 
@@ -7018,7 +7030,7 @@ static gchar* photo_metadata_real_get_comment (MediaMetadata* base) {
 	result = _tmp1_;
 #line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7017 "PhotoMetadata.c"
+#line 7029 "PhotoMetadata.c"
 }
 
 
@@ -7033,7 +7045,7 @@ void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, Phot
 	_tmp1_ = is_string_empty (_tmp0_);
 #line 973 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp1_) {
-#line 7032 "PhotoMetadata.c"
+#line 7044 "PhotoMetadata.c"
 		gchar** _tmp2_ = NULL;
 		gint _tmp2__length1 = 0;
 		const gchar* _tmp3_ = NULL;
@@ -7048,7 +7060,7 @@ void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, Phot
 		_tmp4_ = option;
 #line 974 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_string (self, _tmp2_, _tmp2__length1, _tmp3_, _tmp4_);
-#line 7047 "PhotoMetadata.c"
+#line 7059 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp5_ = NULL;
 		gint _tmp5__length1 = 0;
@@ -7058,7 +7070,7 @@ void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, Phot
 		_tmp5__length1 = photo_metadata_COMMENT_TAGS_length1;
 #line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp5_, _tmp5__length1);
-#line 7057 "PhotoMetadata.c"
+#line 7069 "PhotoMetadata.c"
 	}
 }
 
@@ -7080,7 +7092,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 	_tmp0_ = photo_metadata_KEYWORD_TAGS;
 #line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_KEYWORD_TAGS_length1;
-#line 7079 "PhotoMetadata.c"
+#line 7091 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -7092,14 +7104,14 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 		tag_collection_length1 = _tmp0__length1;
 #line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 7091 "PhotoMetadata.c"
+#line 7103 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
 #line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
 #line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 7098 "PhotoMetadata.c"
+#line 7110 "PhotoMetadata.c"
 			{
 				GeeCollection* values = NULL;
 				const gchar* _tmp2_ = NULL;
@@ -7116,7 +7128,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 				_tmp5_ = values;
 #line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp5_ != NULL) {
-#line 7115 "PhotoMetadata.c"
+#line 7127 "PhotoMetadata.c"
 					GeeCollection* _tmp6_ = NULL;
 					gint _tmp7_ = 0;
 					gint _tmp8_ = 0;
@@ -7128,21 +7140,21 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 					_tmp8_ = _tmp7_;
 #line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp4_ = _tmp8_ > 0;
-#line 7127 "PhotoMetadata.c"
+#line 7139 "PhotoMetadata.c"
 				} else {
 #line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp4_ = FALSE;
-#line 7131 "PhotoMetadata.c"
+#line 7143 "PhotoMetadata.c"
 				}
 #line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp4_) {
-#line 7135 "PhotoMetadata.c"
+#line 7147 "PhotoMetadata.c"
 					GeeSet* _tmp9_ = NULL;
 #line 1001 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp9_ = keywords;
 #line 1001 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					if (_tmp9_ == NULL) {
-#line 7141 "PhotoMetadata.c"
+#line 7153 "PhotoMetadata.c"
 						GCompareDataFunc _tmp10_ = NULL;
 						void* _tmp10__target = NULL;
 						GDestroyNotify _tmp10__target_destroy_notify = NULL;
@@ -7154,6 +7166,10 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 #line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp10__target_destroy_notify = compare_func_target_destroy_notify;
 #line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						compare_func = NULL;
+#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						compare_func_target = NULL;
+#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						compare_func_target_destroy_notify = NULL;
 #line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp11_ = photo_metadata_create_string_set (self, _tmp10_, _tmp10__target, _tmp10__target_destroy_notify);
@@ -7161,7 +7177,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 						_g_object_unref0 (keywords);
 #line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						keywords = _tmp11_;
-#line 7160 "PhotoMetadata.c"
+#line 7176 "PhotoMetadata.c"
 					}
 					{
 						GeeIterator* _current_value_it = NULL;
@@ -7175,7 +7191,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 						_current_value_it = _tmp13_;
 #line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						while (TRUE) {
-#line 7174 "PhotoMetadata.c"
+#line 7190 "PhotoMetadata.c"
 							GeeIterator* _tmp14_ = NULL;
 							gboolean _tmp15_ = FALSE;
 							gchar* current_value = NULL;
@@ -7193,7 +7209,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 							if (!_tmp15_) {
 #line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 								break;
-#line 7192 "PhotoMetadata.c"
+#line 7208 "PhotoMetadata.c"
 							}
 #line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp16_ = _current_value_it;
@@ -7215,18 +7231,18 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 							_g_free0 (_tmp21_);
 #line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_free0 (current_value);
-#line 7214 "PhotoMetadata.c"
+#line 7230 "PhotoMetadata.c"
 						}
 #line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_object_unref0 (_current_value_it);
-#line 7218 "PhotoMetadata.c"
+#line 7234 "PhotoMetadata.c"
 					}
 				}
 #line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_object_unref0 (values);
 #line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 7225 "PhotoMetadata.c"
+#line 7241 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -7234,7 +7250,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 	_tmp24_ = keywords;
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp24_ != NULL) {
-#line 7233 "PhotoMetadata.c"
+#line 7249 "PhotoMetadata.c"
 		GeeSet* _tmp25_ = NULL;
 		gint _tmp26_ = 0;
 		gint _tmp27_ = 0;
@@ -7246,25 +7262,25 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 		_tmp27_ = _tmp26_;
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp23_ = _tmp27_ > 0;
-#line 7245 "PhotoMetadata.c"
+#line 7261 "PhotoMetadata.c"
 	} else {
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp23_ = FALSE;
-#line 7249 "PhotoMetadata.c"
+#line 7265 "PhotoMetadata.c"
 	}
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp23_) {
-#line 7253 "PhotoMetadata.c"
+#line 7269 "PhotoMetadata.c"
 		GeeSet* _tmp28_ = NULL;
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp28_ = keywords;
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp22_ = _tmp28_;
-#line 7259 "PhotoMetadata.c"
+#line 7275 "PhotoMetadata.c"
 	} else {
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp22_ = NULL;
-#line 7263 "PhotoMetadata.c"
+#line 7279 "PhotoMetadata.c"
 	}
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp29_ = _g_object_ref0 (_tmp22_);
@@ -7282,14 +7298,14 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 	compare_func_target_destroy_notify = NULL;
 #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7281 "PhotoMetadata.c"
+#line 7297 "PhotoMetadata.c"
 }
 
 
 static gpointer _hierarchical_keyword_field_ref0 (gpointer self) {
 #line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self ? hierarchical_keyword_field_ref (self) : NULL;
-#line 7288 "PhotoMetadata.c"
+#line 7304 "PhotoMetadata.c"
 }
 
 
@@ -7302,7 +7318,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	g_return_val_if_fail (old != NULL, NULL);
 #line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 7301 "PhotoMetadata.c"
+#line 7317 "PhotoMetadata.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -7333,7 +7349,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 7332 "PhotoMetadata.c"
+#line 7348 "PhotoMetadata.c"
 				goto __catch27_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7342,7 +7358,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 7341 "PhotoMetadata.c"
+#line 7357 "PhotoMetadata.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
@@ -7358,7 +7374,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 7357 "PhotoMetadata.c"
+#line 7373 "PhotoMetadata.c"
 				goto __catch27_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7369,7 +7385,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 7368 "PhotoMetadata.c"
+#line 7384 "PhotoMetadata.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
@@ -7383,7 +7399,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 7382 "PhotoMetadata.c"
+#line 7398 "PhotoMetadata.c"
 	}
 	goto __finally27;
 	__catch27_g_regex_error:
@@ -7397,7 +7413,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 7396 "PhotoMetadata.c"
+#line 7412 "PhotoMetadata.c"
 	}
 	__finally27:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7408,7 +7424,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
-#line 7407 "PhotoMetadata.c"
+#line 7423 "PhotoMetadata.c"
 	}
 }
 
@@ -7432,7 +7448,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 7431 "PhotoMetadata.c"
+#line 7447 "PhotoMetadata.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -7440,7 +7456,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 7439 "PhotoMetadata.c"
+#line 7455 "PhotoMetadata.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -7452,7 +7468,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 7451 "PhotoMetadata.c"
+#line 7467 "PhotoMetadata.c"
 	}
 }
 
@@ -7476,21 +7492,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 7475 "PhotoMetadata.c"
+#line 7491 "PhotoMetadata.c"
 		glong _tmp2_ = 0L;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 7481 "PhotoMetadata.c"
+#line 7497 "PhotoMetadata.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 7485 "PhotoMetadata.c"
+#line 7501 "PhotoMetadata.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 7489 "PhotoMetadata.c"
+#line 7505 "PhotoMetadata.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -7502,7 +7518,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 7501 "PhotoMetadata.c"
+#line 7517 "PhotoMetadata.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -7512,13 +7528,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 7511 "PhotoMetadata.c"
+#line 7527 "PhotoMetadata.c"
 	}
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 7517 "PhotoMetadata.c"
+#line 7533 "PhotoMetadata.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -7532,7 +7548,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 7531 "PhotoMetadata.c"
+#line 7547 "PhotoMetadata.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -7542,13 +7558,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 7541 "PhotoMetadata.c"
+#line 7557 "PhotoMetadata.c"
 	}
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 7547 "PhotoMetadata.c"
+#line 7563 "PhotoMetadata.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7557,7 +7573,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 7556 "PhotoMetadata.c"
+#line 7572 "PhotoMetadata.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -7577,7 +7593,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 7576 "PhotoMetadata.c"
+#line 7592 "PhotoMetadata.c"
 }
 
 
@@ -7595,7 +7611,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 	_tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
 #line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 7594 "PhotoMetadata.c"
+#line 7610 "PhotoMetadata.c"
 	{
 		HierarchicalKeywordField** current_field_collection = NULL;
 		gint current_field_collection_length1 = 0;
@@ -7607,14 +7623,14 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 		current_field_collection_length1 = _tmp0__length1;
 #line 1013 "/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 7606 "PhotoMetadata.c"
+#line 7622 "PhotoMetadata.c"
 			HierarchicalKeywordField* _tmp1_ = NULL;
 			HierarchicalKeywordField* current_field = NULL;
 #line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]);
 #line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			current_field = _tmp1_;
-#line 7613 "PhotoMetadata.c"
+#line 7629 "PhotoMetadata.c"
 			{
 				HierarchicalKeywordField* _tmp2_ = NULL;
 				const gchar* _tmp3_ = NULL;
@@ -7626,7 +7642,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 				photo_metadata_remove_tag (self, _tmp3_);
 #line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_hierarchical_keyword_field_unref0 (current_field);
-#line 7625 "PhotoMetadata.c"
+#line 7641 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -7636,13 +7652,13 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 	if (_tmp4_ == NULL) {
 #line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 7635 "PhotoMetadata.c"
+#line 7651 "PhotoMetadata.c"
 	}
 #line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
 #line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 7641 "PhotoMetadata.c"
+#line 7657 "PhotoMetadata.c"
 	{
 		HierarchicalKeywordField** current_field_collection = NULL;
 		gint current_field_collection_length1 = 0;
@@ -7654,14 +7670,14 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 		current_field_collection_length1 = _tmp5__length1;
 #line 1019 "/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 7653 "PhotoMetadata.c"
+#line 7669 "PhotoMetadata.c"
 			HierarchicalKeywordField* _tmp6_ = NULL;
 			HierarchicalKeywordField* current_field = NULL;
 #line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp6_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]);
 #line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			current_field = _tmp6_;
-#line 7660 "PhotoMetadata.c"
+#line 7676 "PhotoMetadata.c"
 			{
 				HierarchicalKeywordField* _tmp7_ = NULL;
 				gboolean _tmp8_ = FALSE;
@@ -7680,13 +7696,13 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 					_hierarchical_keyword_field_unref0 (current_field);
 #line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					continue;
-#line 7679 "PhotoMetadata.c"
+#line 7695 "PhotoMetadata.c"
 				}
 #line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-				_tmp9_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+				_tmp9_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				writeable_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_SET, GeeSet);
-#line 7685 "PhotoMetadata.c"
+#line 7701 "PhotoMetadata.c"
 				{
 					GeeIterator* _current_path_it = NULL;
 					HierarchicalTagIndex* _tmp10_ = NULL;
@@ -7710,7 +7726,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 					_current_path_it = _tmp14_;
 #line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					while (TRUE) {
-#line 7709 "PhotoMetadata.c"
+#line 7725 "PhotoMetadata.c"
 						GeeIterator* _tmp15_ = NULL;
 						gboolean _tmp16_ = FALSE;
 						gchar* current_path = NULL;
@@ -7733,7 +7749,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 						if (!_tmp16_) {
 #line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							break;
-#line 7732 "PhotoMetadata.c"
+#line 7748 "PhotoMetadata.c"
 						}
 #line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp17_ = _current_path_it;
@@ -7757,7 +7773,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 						_tmp24_ = _tmp23_->wants_leading_separator;
 #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						if (!_tmp24_) {
-#line 7756 "PhotoMetadata.c"
+#line 7772 "PhotoMetadata.c"
 							const gchar* _tmp25_ = NULL;
 							gchar* _tmp26_ = NULL;
 #line 1029 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7768,7 +7784,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 							_g_free0 (writeable_path);
 #line 1029 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							writeable_path = _tmp26_;
-#line 7767 "PhotoMetadata.c"
+#line 7783 "PhotoMetadata.c"
 						}
 #line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp27_ = writeable_set;
@@ -7780,11 +7796,11 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 						_g_free0 (writeable_path);
 #line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_free0 (current_path);
-#line 7779 "PhotoMetadata.c"
+#line 7795 "PhotoMetadata.c"
 					}
 #line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (_current_path_it);
-#line 7783 "PhotoMetadata.c"
+#line 7799 "PhotoMetadata.c"
 				}
 #line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp29_ = current_field;
@@ -7798,7 +7814,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 				_g_object_unref0 (writeable_set);
 #line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_hierarchical_keyword_field_unref0 (current_field);
-#line 7797 "PhotoMetadata.c"
+#line 7813 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -7821,14 +7837,14 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 #line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	htag_index = _tmp0_;
 #line 1040 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp1_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+	_tmp1_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 1040 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	flat_keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SET, GeeSet);
 #line 1042 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = keywords;
 #line 1042 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp2_ != NULL) {
-#line 7827 "PhotoMetadata.c"
+#line 7843 "PhotoMetadata.c"
 		GeeSet* _tmp24_ = NULL;
 		HierarchicalTagIndex* _tmp25_ = NULL;
 		GeeCollection* _tmp26_ = NULL;
@@ -7845,7 +7861,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 			_keyword_it = _tmp4_;
 #line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			while (TRUE) {
-#line 7844 "PhotoMetadata.c"
+#line 7860 "PhotoMetadata.c"
 				GeeIterator* _tmp5_ = NULL;
 				gboolean _tmp6_ = FALSE;
 				gchar* keyword = NULL;
@@ -7861,7 +7877,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 				if (!_tmp6_) {
 #line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					break;
-#line 7860 "PhotoMetadata.c"
+#line 7876 "PhotoMetadata.c"
 				}
 #line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp7_ = _keyword_it;
@@ -7875,7 +7891,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 				_tmp10_ = g_str_has_prefix (_tmp9_, TAG_PATH_SEPARATOR_STRING);
 #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp10_) {
-#line 7874 "PhotoMetadata.c"
+#line 7890 "PhotoMetadata.c"
 					GeeCollection* path_components = NULL;
 					const gchar* _tmp11_ = NULL;
 					GeeList* _tmp12_ = NULL;
@@ -7885,7 +7901,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 					_tmp12_ = hierarchical_tag_utilities_enumerate_path_components (_tmp11_);
 #line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					path_components = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 7884 "PhotoMetadata.c"
+#line 7900 "PhotoMetadata.c"
 					{
 						GeeIterator* _component_it = NULL;
 						GeeCollection* _tmp13_ = NULL;
@@ -7898,7 +7914,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 						_component_it = _tmp14_;
 #line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						while (TRUE) {
-#line 7897 "PhotoMetadata.c"
+#line 7913 "PhotoMetadata.c"
 							GeeIterator* _tmp15_ = NULL;
 							gboolean _tmp16_ = FALSE;
 							gchar* component = NULL;
@@ -7915,7 +7931,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 							if (!_tmp16_) {
 #line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 								break;
-#line 7914 "PhotoMetadata.c"
+#line 7930 "PhotoMetadata.c"
 							}
 #line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp17_ = _component_it;
@@ -7933,15 +7949,15 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 							hierarchical_tag_index_add_path (_tmp19_, _tmp20_, _tmp21_);
 #line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_free0 (component);
-#line 7932 "PhotoMetadata.c"
+#line 7948 "PhotoMetadata.c"
 						}
 #line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_object_unref0 (_component_it);
-#line 7936 "PhotoMetadata.c"
+#line 7952 "PhotoMetadata.c"
 					}
 #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (path_components);
-#line 7940 "PhotoMetadata.c"
+#line 7956 "PhotoMetadata.c"
 				} else {
 					GeeSet* _tmp22_ = NULL;
 					const gchar* _tmp23_ = NULL;
@@ -7951,15 +7967,15 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 					_tmp23_ = keyword;
 #line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
-#line 7950 "PhotoMetadata.c"
+#line 7966 "PhotoMetadata.c"
 				}
 #line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (keyword);
-#line 7954 "PhotoMetadata.c"
+#line 7970 "PhotoMetadata.c"
 			}
 #line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_object_unref0 (_keyword_it);
-#line 7958 "PhotoMetadata.c"
+#line 7974 "PhotoMetadata.c"
 		}
 #line 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp24_ = flat_keywords;
@@ -7973,13 +7989,13 @@ 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 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_object_unref0 (_tmp27_);
-#line 7972 "PhotoMetadata.c"
+#line 7988 "PhotoMetadata.c"
 	}
 #line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp28_ = keywords;
 #line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp28_ != NULL) {
-#line 7978 "PhotoMetadata.c"
+#line 7994 "PhotoMetadata.c"
 		gchar** _tmp29_ = NULL;
 		gint _tmp29__length1 = 0;
 		GeeSet* _tmp30_ = NULL;
@@ -7999,7 +8015,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 		_tmp32_ = htag_index;
 #line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_internal_set_hierarchical_keywords (self, _tmp32_);
-#line 7998 "PhotoMetadata.c"
+#line 8014 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp33_ = NULL;
 		gint _tmp33__length1 = 0;
@@ -8011,13 +8027,13 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 		photo_metadata_remove_tags (self, _tmp33_, _tmp33__length1);
 #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_internal_set_hierarchical_keywords (self, NULL);
-#line 8010 "PhotoMetadata.c"
+#line 8026 "PhotoMetadata.c"
 	}
 #line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (flat_keywords);
 #line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_hierarchical_tag_index_unref0 (htag_index);
-#line 8016 "PhotoMetadata.c"
+#line 8032 "PhotoMetadata.c"
 }
 
 
@@ -8031,7 +8047,7 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 	_tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
 #line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 8030 "PhotoMetadata.c"
+#line 8046 "PhotoMetadata.c"
 	{
 		HierarchicalKeywordField** field_collection = NULL;
 		gint field_collection_length1 = 0;
@@ -8043,14 +8059,14 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 		field_collection_length1 = _tmp0__length1;
 #line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (field_it = 0; field_it < _tmp0__length1; field_it = field_it + 1) {
-#line 8042 "PhotoMetadata.c"
+#line 8058 "PhotoMetadata.c"
 			HierarchicalKeywordField* _tmp1_ = NULL;
 			HierarchicalKeywordField* field = NULL;
 #line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]);
 #line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			field = _tmp1_;
-#line 8049 "PhotoMetadata.c"
+#line 8065 "PhotoMetadata.c"
 			{
 				GeeCollection* values = NULL;
 				HierarchicalKeywordField* _tmp2_ = NULL;
@@ -8070,7 +8086,7 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 				_tmp6_ = values;
 #line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp6_ != NULL) {
-#line 8069 "PhotoMetadata.c"
+#line 8085 "PhotoMetadata.c"
 					GeeCollection* _tmp7_ = NULL;
 					gint _tmp8_ = 0;
 					gint _tmp9_ = 0;
@@ -8082,11 +8098,11 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 					_tmp9_ = _tmp8_;
 #line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp5_ = _tmp9_ > 0;
-#line 8081 "PhotoMetadata.c"
+#line 8097 "PhotoMetadata.c"
 				} else {
 #line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp5_ = FALSE;
-#line 8085 "PhotoMetadata.c"
+#line 8101 "PhotoMetadata.c"
 				}
 #line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp5_) {
@@ -8098,13 +8114,13 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 					_hierarchical_keyword_field_unref0 (field);
 #line 1071 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 8097 "PhotoMetadata.c"
+#line 8113 "PhotoMetadata.c"
 				}
 #line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_object_unref0 (values);
 #line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_hierarchical_keyword_field_unref0 (field);
-#line 8103 "PhotoMetadata.c"
+#line 8119 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -8112,7 +8128,7 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 	result = FALSE;
 #line 1074 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8111 "PhotoMetadata.c"
+#line 8127 "PhotoMetadata.c"
 }
 
 
@@ -8138,7 +8154,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 	_tmp2_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
 #line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 8137 "PhotoMetadata.c"
+#line 8153 "PhotoMetadata.c"
 	{
 		HierarchicalKeywordField** field_collection = NULL;
 		gint field_collection_length1 = 0;
@@ -8150,14 +8166,14 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 		field_collection_length1 = _tmp2__length1;
 #line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (field_it = 0; field_it < _tmp2__length1; field_it = field_it + 1) {
-#line 8149 "PhotoMetadata.c"
+#line 8165 "PhotoMetadata.c"
 			HierarchicalKeywordField* _tmp3_ = NULL;
 			HierarchicalKeywordField* field = NULL;
 #line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]);
 #line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			field = _tmp3_;
-#line 8156 "PhotoMetadata.c"
+#line 8172 "PhotoMetadata.c"
 			{
 				GeeCollection* values = NULL;
 				HierarchicalKeywordField* _tmp4_ = NULL;
@@ -8181,7 +8197,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 				if (_tmp8_ == NULL) {
 #line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ = TRUE;
-#line 8180 "PhotoMetadata.c"
+#line 8196 "PhotoMetadata.c"
 				} else {
 					GeeCollection* _tmp9_ = NULL;
 					gint _tmp10_ = 0;
@@ -8194,7 +8210,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 					_tmp11_ = _tmp10_;
 #line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ = _tmp11_ < 1;
-#line 8193 "PhotoMetadata.c"
+#line 8209 "PhotoMetadata.c"
 				}
 #line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp7_) {
@@ -8204,13 +8220,13 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 					_hierarchical_keyword_field_unref0 (field);
 #line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					continue;
-#line 8203 "PhotoMetadata.c"
+#line 8219 "PhotoMetadata.c"
 				}
 #line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-				_tmp12_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+				_tmp12_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				transformed_values = _tmp12_;
-#line 8209 "PhotoMetadata.c"
+#line 8225 "PhotoMetadata.c"
 				{
 					GeeIterator* _current_value_it = NULL;
 					GeeCollection* _tmp13_ = NULL;
@@ -8223,7 +8239,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 					_current_value_it = _tmp14_;
 #line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					while (TRUE) {
-#line 8222 "PhotoMetadata.c"
+#line 8238 "PhotoMetadata.c"
 						GeeIterator* _tmp15_ = NULL;
 						gboolean _tmp16_ = FALSE;
 						gchar* current_value = NULL;
@@ -8237,7 +8253,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 						if (!_tmp16_) {
 #line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							break;
-#line 8236 "PhotoMetadata.c"
+#line 8252 "PhotoMetadata.c"
 						}
 #line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp17_ = _current_value_it;
@@ -8245,7 +8261,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 						_tmp18_ = gee_iterator_get (_tmp17_);
 #line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						current_value = (gchar*) _tmp18_;
-#line 8244 "PhotoMetadata.c"
+#line 8260 "PhotoMetadata.c"
 						{
 							GeeList* transformed = NULL;
 							HierarchicalKeywordField* _tmp19_ = NULL;
@@ -8266,7 +8282,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 							transformed = _tmp22_;
 #line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8265 "PhotoMetadata.c"
+#line 8281 "PhotoMetadata.c"
 								goto __catch28_g_error;
 							}
 #line 1092 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8277,7 +8293,7 @@ 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 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_object_unref0 (transformed);
-#line 8276 "PhotoMetadata.c"
+#line 8292 "PhotoMetadata.c"
 						}
 						goto __finally28;
 						__catch28_g_error:
@@ -8300,7 +8316,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 							g_critical ("PhotoMetadata.vala:1094: Failed to transform tag value %s: %s", _tmp25_, _tmp27_);
 #line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_error_free0 (_error_);
-#line 8299 "PhotoMetadata.c"
+#line 8315 "PhotoMetadata.c"
 						}
 						__finally28:
 #line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8323,15 +8339,15 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 							g_clear_error (&_inner_error_);
 #line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							return NULL;
-#line 8322 "PhotoMetadata.c"
+#line 8338 "PhotoMetadata.c"
 						}
 #line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_free0 (current_value);
-#line 8326 "PhotoMetadata.c"
+#line 8342 "PhotoMetadata.c"
 					}
 #line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (_current_value_it);
-#line 8330 "PhotoMetadata.c"
+#line 8346 "PhotoMetadata.c"
 				}
 				{
 					GeeArrayList* _current_value_list = NULL;
@@ -8351,7 +8367,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 #line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp30_ = _current_value_list;
 #line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-					_tmp31_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection));
+					_tmp31_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp32_ = _tmp31_;
 #line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8360,7 +8376,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 					_current_value_index = -1;
 #line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					while (TRUE) {
-#line 8359 "PhotoMetadata.c"
+#line 8375 "PhotoMetadata.c"
 						gint _tmp33_ = 0;
 						gint _tmp34_ = 0;
 						gint _tmp35_ = 0;
@@ -8386,7 +8402,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 						if (!(_tmp34_ < _tmp35_)) {
 #line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							break;
-#line 8385 "PhotoMetadata.c"
+#line 8401 "PhotoMetadata.c"
 						}
 #line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp36_ = _current_value_list;
@@ -8410,7 +8426,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 						_tmp43_ = canonicalized;
 #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						if (_tmp43_ != NULL) {
-#line 8409 "PhotoMetadata.c"
+#line 8425 "PhotoMetadata.c"
 							GeeSet* _tmp44_ = NULL;
 							const gchar* _tmp45_ = NULL;
 #line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8419,17 +8435,17 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 							_tmp45_ = canonicalized;
 #line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection), _tmp45_);
-#line 8418 "PhotoMetadata.c"
+#line 8434 "PhotoMetadata.c"
 						}
 #line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_free0 (canonicalized);
 #line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_free0 (current_value);
-#line 8424 "PhotoMetadata.c"
+#line 8440 "PhotoMetadata.c"
 					}
 #line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (_current_value_list);
-#line 8428 "PhotoMetadata.c"
+#line 8444 "PhotoMetadata.c"
 				}
 #line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_object_unref0 (transformed_values);
@@ -8437,7 +8453,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 				_g_object_unref0 (values);
 #line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_hierarchical_keyword_field_unref0 (field);
-#line 8436 "PhotoMetadata.c"
+#line 8452 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -8445,7 +8461,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 	result = h_keywords;
 #line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8444 "PhotoMetadata.c"
+#line 8460 "PhotoMetadata.c"
 }
 
 
@@ -8463,7 +8479,7 @@ gboolean photo_metadata_has_orientation (PhotoMetadata* self) {
 	result = _tmp1_ == GEXIV2_ORIENTATION_UNSPECIFIED;
 #line 1114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8462 "PhotoMetadata.c"
+#line 8478 "PhotoMetadata.c"
 }
 
 
@@ -8489,27 +8505,27 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) {
 	if (_tmp4_ == GEXIV2_ORIENTATION_UNSPECIFIED) {
 #line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = TRUE;
-#line 8488 "PhotoMetadata.c"
+#line 8504 "PhotoMetadata.c"
 	} else {
 		GExiv2Orientation _tmp5_ = 0;
 #line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = orientation;
 #line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = _tmp5_ < ORIENTATION_MIN;
-#line 8495 "PhotoMetadata.c"
+#line 8511 "PhotoMetadata.c"
 	}
 #line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
 #line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = TRUE;
-#line 8501 "PhotoMetadata.c"
+#line 8517 "PhotoMetadata.c"
 	} else {
 		GExiv2Orientation _tmp6_ = 0;
 #line 1123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = orientation;
 #line 1123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = _tmp6_ > ORIENTATION_MAX;
-#line 8508 "PhotoMetadata.c"
+#line 8524 "PhotoMetadata.c"
 	}
 #line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp2_) {
@@ -8517,7 +8533,7 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) {
 		result = ORIENTATION_TOP_LEFT;
 #line 1124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8516 "PhotoMetadata.c"
+#line 8532 "PhotoMetadata.c"
 	} else {
 		GExiv2Orientation _tmp7_ = 0;
 #line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8526,7 +8542,7 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) {
 		result = (Orientation) _tmp7_;
 #line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8525 "PhotoMetadata.c"
+#line 8541 "PhotoMetadata.c"
 	}
 }
 
@@ -8542,7 +8558,7 @@ void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientatio
 	_tmp1_ = orientation;
 #line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_set_orientation (_tmp0_, (GExiv2Orientation) _tmp1_);
-#line 8541 "PhotoMetadata.c"
+#line 8557 "PhotoMetadata.c"
 }
 
 
@@ -8588,43 +8604,43 @@ gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar*
 		if (longitude) {
 #line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*longitude = _vala_longitude;
-#line 8587 "PhotoMetadata.c"
+#line 8603 "PhotoMetadata.c"
 		}
 #line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (long_ref) {
 #line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*long_ref = _vala_long_ref;
-#line 8593 "PhotoMetadata.c"
+#line 8609 "PhotoMetadata.c"
 		} else {
 #line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (_vala_long_ref);
-#line 8597 "PhotoMetadata.c"
+#line 8613 "PhotoMetadata.c"
 		}
 #line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (latitude) {
 #line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*latitude = _vala_latitude;
-#line 8603 "PhotoMetadata.c"
+#line 8619 "PhotoMetadata.c"
 		}
 #line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (lat_ref) {
 #line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*lat_ref = _vala_lat_ref;
-#line 8609 "PhotoMetadata.c"
+#line 8625 "PhotoMetadata.c"
 		} else {
 #line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (_vala_lat_ref);
-#line 8613 "PhotoMetadata.c"
+#line 8629 "PhotoMetadata.c"
 		}
 #line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (altitude) {
 #line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*altitude = _vala_altitude;
-#line 8619 "PhotoMetadata.c"
+#line 8635 "PhotoMetadata.c"
 		}
 #line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8623 "PhotoMetadata.c"
+#line 8639 "PhotoMetadata.c"
 	}
 #line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = photo_metadata_get_string (self, "Exif.GPSInfo.GPSLongitudeRef", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
@@ -8644,43 +8660,43 @@ gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar*
 	if (longitude) {
 #line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*longitude = _vala_longitude;
-#line 8643 "PhotoMetadata.c"
+#line 8659 "PhotoMetadata.c"
 	}
 #line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (long_ref) {
 #line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*long_ref = _vala_long_ref;
-#line 8649 "PhotoMetadata.c"
+#line 8665 "PhotoMetadata.c"
 	} else {
 #line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_vala_long_ref);
-#line 8653 "PhotoMetadata.c"
+#line 8669 "PhotoMetadata.c"
 	}
 #line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (latitude) {
 #line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*latitude = _vala_latitude;
-#line 8659 "PhotoMetadata.c"
+#line 8675 "PhotoMetadata.c"
 	}
 #line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (lat_ref) {
 #line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*lat_ref = _vala_lat_ref;
-#line 8665 "PhotoMetadata.c"
+#line 8681 "PhotoMetadata.c"
 	} else {
 #line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_vala_lat_ref);
-#line 8669 "PhotoMetadata.c"
+#line 8685 "PhotoMetadata.c"
 	}
 #line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (altitude) {
 #line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*altitude = _vala_altitude;
-#line 8675 "PhotoMetadata.c"
+#line 8691 "PhotoMetadata.c"
 	}
 #line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8679 "PhotoMetadata.c"
+#line 8695 "PhotoMetadata.c"
 }
 
 
@@ -8701,11 +8717,11 @@ gboolean photo_metadata_get_exposure (PhotoMetadata* self, MetadataRational* exp
 	if (exposure) {
 #line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*exposure = _vala_exposure;
-#line 8700 "PhotoMetadata.c"
+#line 8716 "PhotoMetadata.c"
 	}
 #line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8704 "PhotoMetadata.c"
+#line 8720 "PhotoMetadata.c"
 }
 
 
@@ -8728,7 +8744,7 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) {
 		result = NULL;
 #line 1156 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8727 "PhotoMetadata.c"
+#line 8743 "PhotoMetadata.c"
 	}
 #line 1158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = metadata_rational_is_valid (&exposure_time);
@@ -8738,7 +8754,7 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) {
 		result = NULL;
 #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8737 "PhotoMetadata.c"
+#line 8753 "PhotoMetadata.c"
 	}
 #line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ExposureTime", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
@@ -8746,7 +8762,7 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) {
 	result = _tmp3_;
 #line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8745 "PhotoMetadata.c"
+#line 8761 "PhotoMetadata.c"
 }
 
 
@@ -8777,11 +8793,11 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
 		if (iso) {
 #line 1168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*iso = _vala_iso;
-#line 8776 "PhotoMetadata.c"
+#line 8792 "PhotoMetadata.c"
 		}
 #line 1168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8780 "PhotoMetadata.c"
+#line 8796 "PhotoMetadata.c"
 	}
 #line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = _vala_iso;
@@ -8789,14 +8805,14 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
 	if (_tmp4_ < ((glong) 6)) {
 #line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = TRUE;
-#line 8788 "PhotoMetadata.c"
+#line 8804 "PhotoMetadata.c"
 	} else {
 		glong _tmp5_ = 0L;
 #line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = _vala_iso;
 #line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = _tmp5_ > ((glong) 409600);
-#line 8795 "PhotoMetadata.c"
+#line 8811 "PhotoMetadata.c"
 	}
 #line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
@@ -8806,11 +8822,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 8805 "PhotoMetadata.c"
+#line 8821 "PhotoMetadata.c"
 		}
 #line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8809 "PhotoMetadata.c"
+#line 8825 "PhotoMetadata.c"
 	}
 #line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = TRUE;
@@ -8818,11 +8834,11 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
 	if (iso) {
 #line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*iso = _vala_iso;
-#line 8817 "PhotoMetadata.c"
+#line 8833 "PhotoMetadata.c"
 	}
 #line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8821 "PhotoMetadata.c"
+#line 8837 "PhotoMetadata.c"
 }
 
 
@@ -8844,7 +8860,7 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) {
 		result = NULL;
 #line 1181 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8843 "PhotoMetadata.c"
+#line 8859 "PhotoMetadata.c"
 	}
 #line 1183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ISOSpeedRatings", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
@@ -8852,7 +8868,7 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) {
 	result = _tmp2_;
 #line 1183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8851 "PhotoMetadata.c"
+#line 8867 "PhotoMetadata.c"
 }
 
 
@@ -8873,11 +8889,11 @@ gboolean photo_metadata_get_aperture (PhotoMetadata* self, MetadataRational* ape
 	if (aperture) {
 #line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*aperture = _vala_aperture;
-#line 8872 "PhotoMetadata.c"
+#line 8888 "PhotoMetadata.c"
 	}
 #line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8876 "PhotoMetadata.c"
+#line 8892 "PhotoMetadata.c"
 }
 
 
@@ -8913,7 +8929,7 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
 		result = NULL;
 #line 1193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8912 "PhotoMetadata.c"
+#line 8928 "PhotoMetadata.c"
 	}
 #line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = aperture;
@@ -8935,11 +8951,11 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
 	if (_tmp8_) {
 #line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = "<i>f</i>/";
-#line 8934 "PhotoMetadata.c"
+#line 8950 "PhotoMetadata.c"
 	} else {
 #line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = "f/";
-#line 8938 "PhotoMetadata.c"
+#line 8954 "PhotoMetadata.c"
 	}
 #line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp10_ = aperture_value;
@@ -8947,11 +8963,11 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
 	if (fmod (_tmp10_, 1) == ((gdouble) 0)) {
 #line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = "%.0f";
-#line 8946 "PhotoMetadata.c"
+#line 8962 "PhotoMetadata.c"
 	} else {
 #line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = "%.1f";
-#line 8950 "PhotoMetadata.c"
+#line 8966 "PhotoMetadata.c"
 	}
 #line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_ = aperture_value;
@@ -8969,7 +8985,7 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
 	result = _tmp15_;
 #line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8968 "PhotoMetadata.c"
+#line 8984 "PhotoMetadata.c"
 }
 
 
@@ -8984,7 +9000,7 @@ gchar* photo_metadata_get_camera_make (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8983 "PhotoMetadata.c"
+#line 8999 "PhotoMetadata.c"
 }
 
 
@@ -8999,7 +9015,7 @@ gchar* photo_metadata_get_camera_model (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 1207 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8998 "PhotoMetadata.c"
+#line 9014 "PhotoMetadata.c"
 }
 
 
@@ -9020,11 +9036,11 @@ gboolean photo_metadata_get_flash (PhotoMetadata* self, glong* flash) {
 	if (flash) {
 #line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*flash = _vala_flash;
-#line 9019 "PhotoMetadata.c"
+#line 9035 "PhotoMetadata.c"
 	}
 #line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9023 "PhotoMetadata.c"
+#line 9039 "PhotoMetadata.c"
 }
 
 
@@ -9039,7 +9055,7 @@ gchar* photo_metadata_get_flash_string (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9038 "PhotoMetadata.c"
+#line 9054 "PhotoMetadata.c"
 }
 
 
@@ -9060,11 +9076,11 @@ gboolean photo_metadata_get_focal_length (PhotoMetadata* self, MetadataRational*
 	if (focal_length) {
 #line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*focal_length = _vala_focal_length;
-#line 9059 "PhotoMetadata.c"
+#line 9075 "PhotoMetadata.c"
 	}
 #line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9063 "PhotoMetadata.c"
+#line 9079 "PhotoMetadata.c"
 }
 
 
@@ -9079,7 +9095,7 @@ gchar* photo_metadata_get_focal_length_string (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 1225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9078 "PhotoMetadata.c"
+#line 9094 "PhotoMetadata.c"
 }
 
 
@@ -9100,7 +9116,7 @@ gchar* photo_metadata_get_artist (PhotoMetadata* self) {
 	result = _tmp1_;
 #line 1235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9099 "PhotoMetadata.c"
+#line 9115 "PhotoMetadata.c"
 }
 
 
@@ -9115,7 +9131,7 @@ gchar* photo_metadata_get_copyright (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 1239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9114 "PhotoMetadata.c"
+#line 9130 "PhotoMetadata.c"
 }
 
 
@@ -9130,7 +9146,7 @@ gchar* photo_metadata_get_software (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 1243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9129 "PhotoMetadata.c"
+#line 9145 "PhotoMetadata.c"
 }
 
 
@@ -9162,7 +9178,7 @@ void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, co
 	_tmp4_ = photo_metadata_has_iptc (self);
 #line 1250 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_) {
-#line 9161 "PhotoMetadata.c"
+#line 9177 "PhotoMetadata.c"
 		const gchar* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
 #line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9173,7 +9189,7 @@ void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, co
 		_tmp6_ = version;
 #line 1252 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_string (self, "Iptc.Application2.ProgramVersion", _tmp6_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 9172 "PhotoMetadata.c"
+#line 9188 "PhotoMetadata.c"
 	}
 }
 
@@ -9187,7 +9203,7 @@ void photo_metadata_remove_software (PhotoMetadata* self) {
 	photo_metadata_remove_tag (self, "Iptc.Application2.Program");
 #line 1259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_remove_tag (self, "Iptc.Application2.ProgramVersion");
-#line 9186 "PhotoMetadata.c"
+#line 9202 "PhotoMetadata.c"
 }
 
 
@@ -9202,7 +9218,7 @@ gchar* photo_metadata_get_exposure_bias (PhotoMetadata* self) {
 	result = _tmp0_;
 #line 1263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9201 "PhotoMetadata.c"
+#line 9217 "PhotoMetadata.c"
 }
 
 
@@ -9233,7 +9249,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 	_tmp2_ = rating_string;
 #line 1276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp2_ != NULL) {
-#line 9232 "PhotoMetadata.c"
+#line 9248 "PhotoMetadata.c"
 		const gchar* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
 		Rating _tmp5_ = 0;
@@ -9249,7 +9265,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 		_g_free0 (rating_string);
 #line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 9248 "PhotoMetadata.c"
+#line 9264 "PhotoMetadata.c"
 	}
 #line 1279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = photo_metadata_get_string (self, "Exif.Image.RatingPercent", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
@@ -9267,7 +9283,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 		_g_free0 (rating_string);
 #line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 9266 "PhotoMetadata.c"
+#line 9282 "PhotoMetadata.c"
 	}
 #line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = rating_string;
@@ -9275,32 +9291,32 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 	_tmp9_ = atoi (_tmp8_);
 #line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	int_percent_rating = _tmp9_;
-#line 9274 "PhotoMetadata.c"
+#line 9290 "PhotoMetadata.c"
 	{
 		gint i = 0;
 #line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		i = 5;
-#line 9279 "PhotoMetadata.c"
+#line 9295 "PhotoMetadata.c"
 		{
 			gboolean _tmp10_ = FALSE;
 #line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp10_ = TRUE;
 #line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			while (TRUE) {
-#line 9286 "PhotoMetadata.c"
+#line 9302 "PhotoMetadata.c"
 				gint _tmp12_ = 0;
 				gint _tmp13_ = 0;
 				gint _tmp14_ = 0;
 				gint _tmp15_ = 0;
 #line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!_tmp10_) {
-#line 9293 "PhotoMetadata.c"
+#line 9309 "PhotoMetadata.c"
 					gint _tmp11_ = 0;
 #line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp11_ = i;
 #line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					i = _tmp11_ - 1;
-#line 9299 "PhotoMetadata.c"
+#line 9315 "PhotoMetadata.c"
 				}
 #line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp10_ = FALSE;
@@ -9310,7 +9326,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 				if (!(_tmp12_ >= 0)) {
 #line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					break;
-#line 9309 "PhotoMetadata.c"
+#line 9325 "PhotoMetadata.c"
 				}
 #line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp13_ = int_percent_rating;
@@ -9320,7 +9336,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 				_tmp15_ = RESOURCES_rating_thresholds[_tmp14_];
 #line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp13_ >= _tmp15_) {
-#line 9319 "PhotoMetadata.c"
+#line 9335 "PhotoMetadata.c"
 					gint _tmp16_ = 0;
 					Rating _tmp17_ = 0;
 #line 1287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9333,7 +9349,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 					_g_free0 (rating_string);
 #line 1287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 9332 "PhotoMetadata.c"
+#line 9348 "PhotoMetadata.c"
 				}
 			}
 		}
@@ -9346,7 +9362,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 	_g_free0 (rating_string);
 #line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9345 "PhotoMetadata.c"
+#line 9361 "PhotoMetadata.c"
 }
 
 
@@ -9393,7 +9409,7 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
 	_tmp8_ = int_rating;
 #line 1302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (0 <= _tmp8_) {
-#line 9392 "PhotoMetadata.c"
+#line 9408 "PhotoMetadata.c"
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
 		gchar* _tmp11_ = NULL;
@@ -9410,7 +9426,7 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
 		photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp12_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
 #line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_tmp12_);
-#line 9409 "PhotoMetadata.c"
+#line 9425 "PhotoMetadata.c"
 	} else {
 		gint _tmp13_ = 0;
 		gchar* _tmp14_ = NULL;
@@ -9425,7 +9441,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 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_tmp15_);
-#line 9424 "PhotoMetadata.c"
+#line 9440 "PhotoMetadata.c"
 	}
 }
 
@@ -9433,7 +9449,7 @@ 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 9432 "PhotoMetadata.c"
+#line 9448 "PhotoMetadata.c"
 }
 
 
@@ -9500,21 +9516,21 @@ static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_
 	self->number = _tmp14_;
 #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self;
-#line 9499 "PhotoMetadata.c"
+#line 9515 "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 9506 "PhotoMetadata.c"
+#line 9522 "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 9513 "PhotoMetadata.c"
+#line 9529 "PhotoMetadata.c"
 }
 
 
@@ -9567,7 +9583,7 @@ 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 9566 "PhotoMetadata.c"
+#line 9582 "PhotoMetadata.c"
 		GExiv2PreviewProperties** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
 		guint _tmp7_ = 0U;
@@ -9579,11 +9595,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 9578 "PhotoMetadata.c"
+#line 9594 "PhotoMetadata.c"
 	} else {
 #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = FALSE;
-#line 9582 "PhotoMetadata.c"
+#line 9598 "PhotoMetadata.c"
 	}
 #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_assert (_tmp4_, "props != null && props.length > number");
@@ -9623,13 +9639,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 9622 "PhotoMetadata.c"
+#line 9638 "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 9628 "PhotoMetadata.c"
+#line 9644 "PhotoMetadata.c"
 }
 
 
@@ -9639,8 +9655,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 = photo_metadata_internal_photo_preview_real_flatten;
-#line 9639 "PhotoMetadata.c"
+	((PhotoPreviewClass *) klass)->flatten = (guint8* (*)(PhotoPreview*, int*, GError**)) photo_metadata_internal_photo_preview_real_flatten;
+#line 9655 "PhotoMetadata.c"
 }
 
 
@@ -9656,7 +9672,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 9655 "PhotoMetadata.c"
+#line 9671 "PhotoMetadata.c"
 }
 
 
@@ -9744,13 +9760,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 = 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 = 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 = 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 = 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"
@@ -10009,7 +10025,7 @@ static void photo_metadata_class_init (PhotoMetadataClass * klass) {
 	photo_metadata_RATING_TAGS = _tmp63_;
 #line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_RATING_TAGS_length1 = 5;
-#line 10008 "PhotoMetadata.c"
+#line 10024 "PhotoMetadata.c"
 }
 
 
@@ -10028,7 +10044,7 @@ 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 10027 "PhotoMetadata.c"
+#line 10043 "PhotoMetadata.c"
 }
 
 
@@ -10044,7 +10060,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 10043 "PhotoMetadata.c"
+#line 10059 "PhotoMetadata.c"
 }
 
 
diff --git a/src/photos/Photos.c b/src/photos/Photos.c
index a5a2b83..72c2778 100644
--- a/src/photos/Photos.c
+++ b/src/photos/Photos.c
@@ -1,4 +1,4 @@
-/* Photos.c generated by valac 0.34.4, the Vala compiler
+/* Photos.c generated by valac 0.34.7, the Vala compiler
  * generated from Photos.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/photos/PngSupport.c b/src/photos/PngSupport.c
index 3229f52..20e79a9 100644
--- a/src/photos/PngSupport.c
+++ b/src/photos/PngSupport.c
@@ -1,4 +1,4 @@
-/* PngSupport.c generated by valac 0.34.4, the Vala compiler
+/* PngSupport.c generated by valac 0.34.7, the Vala compiler
  * generated from PngSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -888,19 +888,19 @@ static void png_file_format_properties_class_init (PngFileFormatPropertiesClass
 #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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -982,12 +982,12 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
 	GFile* _tmp0_ = NULL;
 	GFileInputStream* _tmp1_ = NULL;
 	guint8* file_lead_sequence = NULL;
-	guint8* _tmp2_ = NULL;
+	guint8* _tmp3_ = NULL;
 	gint file_lead_sequence_length1 = 0;
 	gint _file_lead_sequence_size_ = 0;
-	GFileInputStream* _tmp3_ = NULL;
-	guint8* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
+	GFileInputStream* _tmp4_ = NULL;
+	guint8* _tmp5_ = NULL;
+	gint _tmp5__length1 = 0;
 	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,30 +999,34 @@ 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"
+		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 FALSE;
-#line 1007 "PngSupport.c"
+		return _tmp2_;
+#line 1009 "PngSupport.c"
 	}
 #line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	_tmp2_ = g_new0 (guint8, G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE));
+	_tmp3_ = g_new0 (guint8, G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE));
 #line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	file_lead_sequence = _tmp2_;
+	file_lead_sequence = _tmp3_;
 #line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	file_lead_sequence_length1 = G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE);
 #line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_file_lead_sequence_size_ = file_lead_sequence_length1;
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	_tmp3_ = instream;
+	_tmp4_ = instream;
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	_tmp4_ = file_lead_sequence;
+	_tmp5_ = file_lead_sequence;
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	_tmp4__length1 = file_lead_sequence_length1;
+	_tmp5__length1 = file_lead_sequence_length1;
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_input_stream_get_type (), GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_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"
+		gboolean _tmp6_ = FALSE;
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -1030,62 +1034,62 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_g_object_unref0 (instream);
 #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-		return FALSE;
-#line 1035 "PngSupport.c"
+		return _tmp6_;
+#line 1039 "PngSupport.c"
 	}
 	{
 		gint i = 0;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		i = 0;
-#line 1041 "PngSupport.c"
+#line 1045 "PngSupport.c"
 		{
-			gboolean _tmp5_ = FALSE;
+			gboolean _tmp7_ = FALSE;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-			_tmp5_ = TRUE;
+			_tmp7_ = TRUE;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 			while (TRUE) {
-#line 1048 "PngSupport.c"
-				gint _tmp7_ = 0;
-				guint8* _tmp8_ = NULL;
-				gint _tmp8__length1 = 0;
+#line 1052 "PngSupport.c"
 				gint _tmp9_ = 0;
-				guint8 _tmp10_ = 0U;
+				guint8* _tmp10_ = NULL;
+				gint _tmp10__length1 = 0;
 				gint _tmp11_ = 0;
 				guint8 _tmp12_ = 0U;
+				gint _tmp13_ = 0;
+				guint8 _tmp14_ = 0U;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				if (!_tmp5_) {
-#line 1058 "PngSupport.c"
-					gint _tmp6_ = 0;
+				if (!_tmp7_) {
+#line 1062 "PngSupport.c"
+					gint _tmp8_ = 0;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-					_tmp6_ = i;
+					_tmp8_ = i;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-					i = _tmp6_ + 1;
-#line 1064 "PngSupport.c"
+					i = _tmp8_ + 1;
+#line 1068 "PngSupport.c"
 				}
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				_tmp5_ = FALSE;
+				_tmp7_ = FALSE;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				_tmp7_ = i;
+				_tmp9_ = i;
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				if (!(_tmp7_ < G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE))) {
+				if (!(_tmp9_ < G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE))) {
 #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 					break;
-#line 1074 "PngSupport.c"
+#line 1078 "PngSupport.c"
 				}
 #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				_tmp8_ = file_lead_sequence;
+				_tmp10_ = file_lead_sequence;
 #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				_tmp8__length1 = file_lead_sequence_length1;
+				_tmp10__length1 = file_lead_sequence_length1;
 #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				_tmp9_ = i;
+				_tmp11_ = i;
 #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				_tmp10_ = _tmp8_[_tmp9_];
+				_tmp12_ = _tmp10_[_tmp11_];
 #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				_tmp11_ = i;
+				_tmp13_ = i;
 #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				_tmp12_ = PNG_SNIFFER_MAGIC_SEQUENCE[_tmp11_];
+				_tmp14_ = PNG_SNIFFER_MAGIC_SEQUENCE[_tmp13_];
 #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-				if (_tmp10_ != _tmp12_) {
+				if (_tmp12_ != _tmp14_) {
 #line 66 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 					result = FALSE;
 #line 66 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -1094,7 +1098,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 1098 "PngSupport.c"
+#line 1102 "PngSupport.c"
 				}
 			}
 		}
@@ -1107,14 +1111,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 1111 "PngSupport.c"
+#line 1115 "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 1118 "PngSupport.c"
+#line 1122 "PngSupport.c"
 }
 
 
@@ -1150,7 +1154,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 1154 "PngSupport.c"
+#line 1158 "PngSupport.c"
 	}
 #line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	if (!_tmp0_) {
@@ -1160,11 +1164,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 1164 "PngSupport.c"
+#line 1168 "PngSupport.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		return result;
-#line 1168 "PngSupport.c"
+#line 1172 "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_);
@@ -1178,7 +1182,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 1182 "PngSupport.c"
+#line 1186 "PngSupport.c"
 	}
 #line 80 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp5_ = detected;
@@ -1192,11 +1196,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 1196 "PngSupport.c"
+#line 1200 "PngSupport.c"
 		}
 #line 81 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		return result;
-#line 1200 "PngSupport.c"
+#line 1204 "PngSupport.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp7_ = detected;
@@ -1204,17 +1208,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 1208 "PngSupport.c"
+#line 1212 "PngSupport.c"
 		DetectedPhotoInformation* _tmp9_ = NULL;
 #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 1214 "PngSupport.c"
+#line 1218 "PngSupport.c"
 	} else {
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp6_ = NULL;
-#line 1218 "PngSupport.c"
+#line 1222 "PngSupport.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp10_ = _detected_photo_information_ref0 (_tmp6_);
@@ -1226,11 +1230,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 1230 "PngSupport.c"
+#line 1234 "PngSupport.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1234 "PngSupport.c"
+#line 1238 "PngSupport.c"
 }
 
 
@@ -1238,8 +1242,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 = png_sniffer_real_sniff;
-#line 1243 "PngSupport.c"
+	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) png_sniffer_real_sniff;
+#line 1247 "PngSupport.c"
 }
 
 
@@ -1270,14 +1274,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 1274 "PngSupport.c"
+#line 1278 "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 1281 "PngSupport.c"
+#line 1285 "PngSupport.c"
 }
 
 
@@ -1306,7 +1310,7 @@ 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 1310 "PngSupport.c"
+#line 1314 "PngSupport.c"
 	} else {
 		Dimensions _tmp4_ = {0};
 		gint _tmp5_ = 0;
@@ -1316,11 +1320,11 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 		_tmp5_ = _tmp4_.height;
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp1_ = _tmp5_ > 9999;
-#line 1320 "PngSupport.c"
+#line 1324 "PngSupport.c"
 	}
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	if (_tmp1_) {
-#line 1324 "PngSupport.c"
+#line 1328 "PngSupport.c"
 		gboolean _tmp6_ = FALSE;
 		Dimensions _tmp7_ = {0};
 		gint _tmp8_ = 0;
@@ -1332,7 +1336,7 @@ 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 1336 "PngSupport.c"
+#line 1340 "PngSupport.c"
 		} else {
 			Dimensions _tmp9_ = {0};
 			gint _tmp10_ = 0;
@@ -1342,19 +1346,19 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 			_tmp10_ = _tmp9_.height;
 #line 103 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 			_tmp6_ = _tmp10_ < 100;
-#line 1346 "PngSupport.c"
+#line 1350 "PngSupport.c"
 		}
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp0_ = _tmp6_;
-#line 1350 "PngSupport.c"
+#line 1354 "PngSupport.c"
 	} else {
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp0_ = FALSE;
-#line 1354 "PngSupport.c"
+#line 1358 "PngSupport.c"
 	}
 #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	if (_tmp0_) {
-#line 1358 "PngSupport.c"
+#line 1362 "PngSupport.c"
 		Dimensions prefetch_dimensions = {0};
 		Dimensions _tmp11_ = {0};
 		GdkPixbuf* _tmp12_ = NULL;
@@ -1405,7 +1409,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 1409 "PngSupport.c"
+#line 1413 "PngSupport.c"
 		}
 #line 107 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp21_ = _tmp12_;
@@ -1433,7 +1437,7 @@ 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 1437 "PngSupport.c"
+#line 1441 "PngSupport.c"
 	} else {
 		GdkPixbuf* _tmp28_ = NULL;
 		gchar* _tmp29_ = NULL;
@@ -1473,7 +1477,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 1477 "PngSupport.c"
+#line 1481 "PngSupport.c"
 		}
 #line 112 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 		_tmp37_ = _tmp28_;
@@ -1485,13 +1489,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 1489 "PngSupport.c"
+#line 1493 "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 1495 "PngSupport.c"
+#line 1499 "PngSupport.c"
 }
 
 
@@ -1499,8 +1503,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 = png_reader_real_scaled_read;
-#line 1504 "PngSupport.c"
+	((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) png_reader_real_scaled_read;
+#line 1508 "PngSupport.c"
 }
 
 
@@ -1531,14 +1535,14 @@ 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 1535 "PngSupport.c"
+#line 1539 "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 1542 "PngSupport.c"
+#line 1546 "PngSupport.c"
 }
 
 
@@ -1568,7 +1572,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 1572 "PngSupport.c"
+#line 1576 "PngSupport.c"
 	}
 }
 
@@ -1577,8 +1581,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 = png_writer_real_write;
-#line 1582 "PngSupport.c"
+	((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) png_writer_real_write;
+#line 1586 "PngSupport.c"
 }
 
 
@@ -1609,14 +1613,14 @@ 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 1613 "PngSupport.c"
+#line 1617 "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 1620 "PngSupport.c"
+#line 1624 "PngSupport.c"
 }
 
 
@@ -1646,7 +1650,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 1650 "PngSupport.c"
+#line 1654 "PngSupport.c"
 	}
 }
 
@@ -1655,8 +1659,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 = png_metadata_writer_real_write_metadata;
-#line 1660 "PngSupport.c"
+	((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) png_metadata_writer_real_write_metadata;
+#line 1664 "PngSupport.c"
 }
 
 
@@ -1686,14 +1690,14 @@ 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 1690 "PngSupport.c"
+#line 1694 "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 1697 "PngSupport.c"
+#line 1701 "PngSupport.c"
 }
 
 
@@ -1709,7 +1713,7 @@ PngFileFormatDriver* png_file_format_driver_get_instance (void) {
 	result = _tmp1_;
 #line 149 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	return result;
-#line 1713 "PngSupport.c"
+#line 1717 "PngSupport.c"
 }
 
 
@@ -1725,7 +1729,7 @@ 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 1729 "PngSupport.c"
+#line 1733 "PngSupport.c"
 }
 
 
@@ -1746,7 +1750,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 1750 "PngSupport.c"
+#line 1754 "PngSupport.c"
 }
 
 
@@ -1759,7 +1763,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 1763 "PngSupport.c"
+#line 1767 "PngSupport.c"
 }
 
 
@@ -1772,7 +1776,7 @@ 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 1776 "PngSupport.c"
+#line 1780 "PngSupport.c"
 }
 
 
@@ -1793,7 +1797,7 @@ 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 1797 "PngSupport.c"
+#line 1801 "PngSupport.c"
 }
 
 
@@ -1814,7 +1818,7 @@ 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 1818 "PngSupport.c"
+#line 1822 "PngSupport.c"
 }
 
 
@@ -1838,7 +1842,7 @@ 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 1842 "PngSupport.c"
+#line 1846 "PngSupport.c"
 }
 
 
@@ -1854,7 +1858,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 1858 "PngSupport.c"
+#line 1862 "PngSupport.c"
 }
 
 
@@ -1864,14 +1868,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 1868 "PngSupport.c"
+#line 1872 "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 1875 "PngSupport.c"
+#line 1879 "PngSupport.c"
 }
 
 
@@ -1881,22 +1885,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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = png_file_format_driver_real_create_metadata;
-#line 1900 "PngSupport.c"
+	((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) png_file_format_driver_real_create_metadata;
+#line 1904 "PngSupport.c"
 }
 
 
@@ -1910,7 +1914,7 @@ static void png_file_format_driver_finalize (PhotoFileFormatDriver* obj) {
 	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 1914 "PngSupport.c"
+#line 1918 "PngSupport.c"
 }
 
 
diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c
index 1b0d4b8..8e23487 100644
--- a/src/photos/RawSupport.c
+++ b/src/photos/RawSupport.c
@@ -1,4 +1,4 @@
-/* RawSupport.c generated by valac 0.34.4, the Vala compiler
+/* RawSupport.c generated by valac 0.34.7, the Vala compiler
  * generated from RawSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -848,21 +848,21 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = raw_file_format_driver_real_create_sniffer;
+	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) raw_file_format_driver_real_create_sniffer;
 #line 867 "RawSupport.c"
 }
 
@@ -1242,19 +1242,19 @@ static void raw_file_format_properties_class_init (RawFileFormatPropertiesClass
 #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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -2206,7 +2206,7 @@ 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 = raw_sniffer_real_sniff;
+	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) raw_sniffer_real_sniff;
 #line 2211 "RawSupport.c"
 }
 
@@ -2696,11 +2696,11 @@ 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 = 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 = 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 = raw_reader_real_scaled_read;
+	((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) raw_reader_real_scaled_read;
 #line 2705 "RawSupport.c"
 }
 
diff --git a/src/photos/TiffSupport.c b/src/photos/TiffSupport.c
index 1b70973..1fcbfa7 100644
--- a/src/photos/TiffSupport.c
+++ b/src/photos/TiffSupport.c
@@ -1,4 +1,4 @@
-/* TiffSupport.c generated by valac 0.34.4, the Vala compiler
+/* TiffSupport.c generated by valac 0.34.7, the Vala compiler
  * generated from TiffSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
 }
 
@@ -1121,19 +1121,19 @@ static void photos_tiff_file_format_properties_class_init (PhotosTiffFileFormatP
 #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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -1340,7 +1340,7 @@ 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 = photos_tiff_sniffer_real_sniff;
+	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) photos_tiff_sniffer_real_sniff;
 #line 1345 "TiffSupport.c"
 }
 
@@ -1463,7 +1463,7 @@ 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 = photos_tiff_writer_real_write;
+	((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) photos_tiff_writer_real_write;
 #line 1468 "TiffSupport.c"
 }
 
@@ -1541,7 +1541,7 @@ 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 = photos_tiff_metadata_writer_real_write_metadata;
+	((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) photos_tiff_metadata_writer_real_write_metadata;
 #line 1546 "TiffSupport.c"
 }
 
@@ -1568,19 +1568,19 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 	GFile* _tmp1_ = NULL;
 	GFileInputStream* _tmp2_ = NULL;
 	GDataInputStream* dins = NULL;
-	GDataInputStream* _tmp3_ = NULL;
+	GDataInputStream* _tmp4_ = NULL;
 	GDataStreamByteOrder order = 0;
-	guint16 _tmp4_ = 0U;
-	GDataInputStream* _tmp5_ = NULL;
-	GCancellable* _tmp6_ = NULL;
-	guint16 _tmp7_ = 0U;
-	GDataInputStream* _tmp8_ = NULL;
-	GDataStreamByteOrder _tmp9_ = 0;
-	guint16 lue = 0U;
+	guint16 _tmp5_ = 0U;
+	GDataInputStream* _tmp6_ = NULL;
+	GCancellable* _tmp7_ = NULL;
+	guint16 _tmp8_ = 0U;
 	GDataInputStream* _tmp10_ = NULL;
-	GCancellable* _tmp11_ = NULL;
-	guint16 _tmp12_ = 0U;
-	guint16 _tmp13_ = 0U;
+	GDataStreamByteOrder _tmp11_ = 0;
+	guint16 lue = 0U;
+	GDataInputStream* _tmp12_ = NULL;
+	GCancellable* _tmp13_ = NULL;
+	guint16 _tmp14_ = 0U;
+	guint16 _tmp16_ = 0U;
 	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,26 +1594,30 @@ 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"
+		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 FALSE;
-#line 1602 "TiffSupport.c"
+		return _tmp3_;
+#line 1604 "TiffSupport.c"
 	}
 #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream));
+	_tmp4_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream));
 #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	dins = _tmp3_;
+	dins = _tmp4_;
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp5_ = dins;
+	_tmp6_ = dins;
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp6_ = cancellable;
+	_tmp7_ = cancellable;
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp7_ = g_data_input_stream_read_uint16 (_tmp5_, _tmp6_, &_inner_error_);
+	_tmp8_ = g_data_input_stream_read_uint16 (_tmp6_, _tmp7_, &_inner_error_);
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp4_ = _tmp7_;
+	_tmp5_ = _tmp8_;
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1620 "TiffSupport.c"
+		gboolean _tmp9_ = FALSE;
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1621,30 +1625,30 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		_g_object_unref0 (_tmp0_);
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-		return FALSE;
-#line 1626 "TiffSupport.c"
+		return _tmp9_;
+#line 1630 "TiffSupport.c"
 	}
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	switch (_tmp4_) {
+	switch (_tmp5_) {
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		case 0x4949:
-#line 1632 "TiffSupport.c"
+#line 1636 "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 1638 "TiffSupport.c"
+#line 1642 "TiffSupport.c"
 		}
 #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		case 0x4D4D:
-#line 1642 "TiffSupport.c"
+#line 1646 "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 1648 "TiffSupport.c"
+#line 1652 "TiffSupport.c"
 		}
 		default:
 		{
@@ -1656,25 +1660,27 @@ 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 1660 "TiffSupport.c"
+#line 1664 "TiffSupport.c"
 		}
 	}
 #line 172 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp8_ = dins;
+	_tmp10_ = dins;
 #line 172 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp9_ = order;
+	_tmp11_ = order;
 #line 172 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	g_data_input_stream_set_byte_order (_tmp8_, _tmp9_);
+	g_data_input_stream_set_byte_order (_tmp10_, _tmp11_);
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp10_ = dins;
+	_tmp12_ = dins;
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp11_ = cancellable;
+	_tmp13_ = cancellable;
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp12_ = g_data_input_stream_read_uint16 (_tmp10_, _tmp11_, &_inner_error_);
+	_tmp14_ = g_data_input_stream_read_uint16 (_tmp12_, _tmp13_, &_inner_error_);
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	lue = _tmp12_;
+	lue = _tmp14_;
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1683 "TiffSupport.c"
+		gboolean _tmp15_ = FALSE;
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1682,13 +1688,13 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		_g_object_unref0 (_tmp0_);
 #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-		return FALSE;
-#line 1687 "TiffSupport.c"
+		return _tmp15_;
+#line 1693 "TiffSupport.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp13_ = lue;
+	_tmp16_ = lue;
 #line 176 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	if (((gint) _tmp13_) != 42) {
+	if (((gint) _tmp16_) != 42) {
 #line 177 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 		result = FALSE;
 #line 177 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1697,7 +1703,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 1701 "TiffSupport.c"
+#line 1707 "TiffSupport.c"
 	}
 #line 180 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	result = TRUE;
@@ -1707,7 +1713,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 1711 "TiffSupport.c"
+#line 1717 "TiffSupport.c"
 }
 
 
diff --git a/src/plugins/DataImportsInterfaces.c b/src/plugins/DataImportsInterfaces.c
index 57e5069..7a23e74 100644
--- a/src/plugins/DataImportsInterfaces.c
+++ b/src/plugins/DataImportsInterfaces.c
@@ -1,4 +1,4 @@
-/* DataImportsInterfaces.c generated by valac 0.34.4, the Vala compiler
+/* DataImportsInterfaces.c generated by valac 0.34.7, 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 af0f48d..6ceefd9 100644
--- a/src/plugins/ManifestWidget.c
+++ b/src/plugins/ManifestWidget.c
@@ -1,4 +1,4 @@
-/* ManifestWidget.c generated by valac 0.34.4, the Vala compiler
+/* ManifestWidget.c generated by valac 0.34.7, the Vala compiler
  * generated from ManifestWidget.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -14,9 +14,9 @@
 #include <string.h>
 #include "shotwell-plugin-dev-1.0.h"
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdk.h>
 #include <gee.h>
 #include <gio/gio.h>
-#include <gdk/gdk.h>
 #include <gobject/gvaluecollector.h>
 
 
@@ -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 = 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"
diff --git a/src/plugins/Plugins.c b/src/plugins/Plugins.c
index c6ccfad..aeda91e 100644
--- a/src/plugins/Plugins.c
+++ b/src/plugins/Plugins.c
@@ -1,4 +1,4 @@
-/* Plugins.c generated by valac 0.34.4, the Vala compiler
+/* Plugins.c generated by valac 0.34.7, the Vala compiler
  * generated from Plugins.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1826,25 +1826,25 @@ void plugins_init (GError** error) {
 #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_vala_array_add48 (&plugins_search_dirs, &plugins_search_dirs_length1, &_plugins_search_dirs_size_, _tmp4_);
 #line 118 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp5_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, PLUGINS_TYPE_MODULE_REP, (GBoxedCopyFunc) plugins_module_rep_ref, plugins_module_rep_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp5_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, PLUGINS_TYPE_MODULE_REP, (GBoxedCopyFunc) plugins_module_rep_ref, (GDestroyNotify) plugins_module_rep_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 118 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_object_unref0 (plugins_module_table);
 #line 118 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	plugins_module_table = _tmp5_;
 #line 119 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp6_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, PLUGINS_TYPE_PLUGGABLE_REP, (GBoxedCopyFunc) plugins_pluggable_rep_ref, plugins_pluggable_rep_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp6_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, PLUGINS_TYPE_PLUGGABLE_REP, (GBoxedCopyFunc) plugins_pluggable_rep_ref, (GDestroyNotify) plugins_pluggable_rep_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 119 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_object_unref0 (plugins_pluggable_table);
 #line 119 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	plugins_pluggable_table = _tmp6_;
 #line 120 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp7_ = gee_hash_map_new (G_TYPE_GTYPE, NULL, NULL, PLUGINS_TYPE_EXTENSION_POINT, (GBoxedCopyFunc) plugins_extension_point_ref, plugins_extension_point_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp7_ = gee_hash_map_new (G_TYPE_GTYPE, NULL, NULL, PLUGINS_TYPE_EXTENSION_POINT, (GBoxedCopyFunc) plugins_extension_point_ref, (GDestroyNotify) plugins_extension_point_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 120 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_object_unref0 (plugins_extension_points);
 #line 120 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	plugins_extension_points = _tmp7_;
 #line 121 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp8_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp8_ = 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/plugins/Plugins.vala"
 	_g_object_unref0 (plugins_core_ids);
 #line 121 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2417,7 +2417,7 @@ void plugins_register_extension_point (GType type, const gchar* name, const gcha
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp16_ = plugins_pluggable_table;
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp17_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_MAP, GeeMap));
+		_tmp17_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp18_ = _tmp17_;
 #line 177 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2526,7 +2526,7 @@ GeeCollection* plugins_get_pluggables (gboolean include_disabled) {
 	GeeCollection* all = NULL;
 	GeeHashSet* _tmp0_ = NULL;
 #line 187 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp0_ = gee_hash_set_new (SPIT_TYPE_PLUGGABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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"
@@ -2541,7 +2541,7 @@ GeeCollection* plugins_get_pluggables (gboolean include_disabled) {
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp1_ = plugins_pluggable_table;
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp2_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MAP, GeeMap));
+		_tmp2_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp3_ = _tmp2_;
 #line 188 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2715,7 +2715,7 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) {
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp0_ = plugins_module_table;
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+		_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp2_ = _tmp1_;
 #line 201 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2926,15 +2926,19 @@ GeeCollection* plugins_get_extension_points (GCompareDataFunc compare_func, void
 #line 221 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0__target_destroy_notify = compare_func_target_destroy_notify;
 #line 221 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
+	compare_func = NULL;
+#line 221 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
+	compare_func_target = NULL;
+#line 221 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	compare_func_target_destroy_notify = NULL;
 #line 221 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = gee_tree_set_new (PLUGINS_TYPE_EXTENSION_POINT, (GBoxedCopyFunc) plugins_extension_point_ref, plugins_extension_point_unref, _tmp0_, _tmp0__target, _tmp0__target_destroy_notify);
+	_tmp1_ = gee_tree_set_new (PLUGINS_TYPE_EXTENSION_POINT, (GBoxedCopyFunc) plugins_extension_point_ref, (GDestroyNotify) plugins_extension_point_unref, _tmp0_, _tmp0__target, _tmp0__target_destroy_notify);
 #line 221 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	sorted = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 222 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp2_ = plugins_extension_points;
 #line 222 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp3_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MAP, GeeMap));
+	_tmp3_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 222 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp4_ = _tmp3_;
 #line 222 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2955,7 +2959,7 @@ 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 2958 "Plugins.c"
+#line 2962 "Plugins.c"
 }
 
 
@@ -2984,12 +2988,16 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com
 #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp3__target_destroy_notify = compare_func_target_destroy_notify;
 #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
+	compare_func = NULL;
+#line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
+	compare_func_target = NULL;
+#line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	compare_func_target_destroy_notify = NULL;
 #line 232 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp4_ = gee_tree_set_new (SPIT_TYPE_PLUGGABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp3_, _tmp3__target, _tmp3__target_destroy_notify);
+	_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 2992 "Plugins.c"
+#line 3000 "Plugins.c"
 	{
 		GeeIterator* _pluggable_rep_it = NULL;
 		GeeHashMap* _tmp5_ = NULL;
@@ -3001,7 +3009,7 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp5_ = plugins_pluggable_table;
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-		_tmp6_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_MAP, GeeMap));
+		_tmp6_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp7_ = _tmp6_;
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3016,7 +3024,7 @@ 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 3019 "Plugins.c"
+#line 3027 "Plugins.c"
 			GeeIterator* _tmp11_ = NULL;
 			gboolean _tmp12_ = FALSE;
 			PluginsPluggableRep* pluggable_rep = NULL;
@@ -3035,7 +3043,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 3038 "Plugins.c"
+#line 3046 "Plugins.c"
 			}
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp13_ = _pluggable_rep_it;
@@ -3051,7 +3059,7 @@ 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 3054 "Plugins.c"
+#line 3062 "Plugins.c"
 				PluginsPluggableRep* _tmp20_ = NULL;
 				SpitPluggable* _tmp21_ = NULL;
 				SpitPluggable* _tmp22_ = NULL;
@@ -3072,15 +3080,15 @@ 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 3075 "Plugins.c"
+#line 3083 "Plugins.c"
 			} else {
 #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_tmp16_ = FALSE;
-#line 3079 "Plugins.c"
+#line 3087 "Plugins.c"
 			}
 #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			if (_tmp16_) {
-#line 3083 "Plugins.c"
+#line 3091 "Plugins.c"
 				gboolean _tmp26_ = FALSE;
 				gboolean _tmp27_ = FALSE;
 #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3089,7 +3097,7 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com
 				if (_tmp27_) {
 #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					_tmp26_ = TRUE;
-#line 3092 "Plugins.c"
+#line 3100 "Plugins.c"
 				} else {
 					PluginsPluggableRep* _tmp28_ = NULL;
 					gboolean _tmp29_ = FALSE;
@@ -3099,19 +3107,19 @@ GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc com
 					_tmp29_ = plugins_pluggable_rep_is_enabled (_tmp28_);
 #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					_tmp26_ = _tmp29_;
-#line 3102 "Plugins.c"
+#line 3110 "Plugins.c"
 				}
 #line 236 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_tmp15_ = _tmp26_;
-#line 3106 "Plugins.c"
+#line 3114 "Plugins.c"
 			} else {
 #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_tmp15_ = FALSE;
-#line 3110 "Plugins.c"
+#line 3118 "Plugins.c"
 			}
 #line 234 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			if (_tmp15_) {
-#line 3114 "Plugins.c"
+#line 3122 "Plugins.c"
 				GeeCollection* _tmp30_ = NULL;
 				PluginsPluggableRep* _tmp31_ = NULL;
 				SpitPluggable* _tmp32_ = NULL;
@@ -3126,15 +3134,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 3129 "Plugins.c"
+#line 3137 "Plugins.c"
 			}
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_plugins_pluggable_rep_unref0 (pluggable_rep);
-#line 3133 "Plugins.c"
+#line 3141 "Plugins.c"
 		}
 #line 233 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_g_object_unref0 (_pluggable_rep_it);
-#line 3137 "Plugins.c"
+#line 3145 "Plugins.c"
 	}
 #line 241 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	result = for_type;
@@ -3148,7 +3156,7 @@ 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 3151 "Plugins.c"
+#line 3159 "Plugins.c"
 }
 
 
@@ -3176,7 +3184,7 @@ 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 3179 "Plugins.c"
+#line 3187 "Plugins.c"
 		PluginsPluggableRep* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
 		gboolean _tmp8_ = FALSE;
@@ -3188,15 +3196,15 @@ gchar* plugins_get_pluggable_name (const gchar* id) {
 		_tmp8_ = _tmp7_;
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp4_ = _tmp8_;
-#line 3191 "Plugins.c"
+#line 3199 "Plugins.c"
 	} else {
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp4_ = FALSE;
-#line 3195 "Plugins.c"
+#line 3203 "Plugins.c"
 	}
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp4_) {
-#line 3199 "Plugins.c"
+#line 3207 "Plugins.c"
 		PluginsPluggableRep* _tmp9_ = NULL;
 		SpitPluggable* _tmp10_ = NULL;
 		SpitPluggable* _tmp11_ = NULL;
@@ -3211,11 +3219,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 3214 "Plugins.c"
+#line 3222 "Plugins.c"
 	} else {
 #line 248 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp3_ = NULL;
-#line 3218 "Plugins.c"
+#line 3226 "Plugins.c"
 	}
 #line 247 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp13_ = g_strdup (_tmp3_);
@@ -3225,7 +3233,7 @@ 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 3228 "Plugins.c"
+#line 3236 "Plugins.c"
 }
 
 
@@ -3258,7 +3266,7 @@ 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 3261 "Plugins.c"
+#line 3269 "Plugins.c"
 	} else {
 		PluginsPluggableRep* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
@@ -3271,7 +3279,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 3274 "Plugins.c"
+#line 3282 "Plugins.c"
 	}
 #line 253 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp3_) {
@@ -3281,7 +3289,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 3284 "Plugins.c"
+#line 3292 "Plugins.c"
 	}
 #line 256 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp8_ = pluggable_rep;
@@ -3297,7 +3305,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 3300 "Plugins.c"
+#line 3308 "Plugins.c"
 }
 
 
@@ -3328,7 +3336,7 @@ 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 3331 "Plugins.c"
+#line 3339 "Plugins.c"
 	} else {
 		PluginsPluggableRep* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
@@ -3341,7 +3349,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 3344 "Plugins.c"
+#line 3352 "Plugins.c"
 	}
 #line 263 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp3_) {
@@ -3355,11 +3363,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 3358 "Plugins.c"
+#line 3366 "Plugins.c"
 		}
 #line 266 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		return result;
-#line 3362 "Plugins.c"
+#line 3370 "Plugins.c"
 	}
 #line 269 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp8_ = pluggable_rep;
@@ -3375,11 +3383,11 @@ 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 3378 "Plugins.c"
+#line 3386 "Plugins.c"
 	}
 #line 271 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 3382 "Plugins.c"
+#line 3390 "Plugins.c"
 }
 
 
@@ -3409,7 +3417,7 @@ 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 3412 "Plugins.c"
+#line 3420 "Plugins.c"
 	} else {
 		PluginsPluggableRep* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
@@ -3422,7 +3430,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 3425 "Plugins.c"
+#line 3433 "Plugins.c"
 	}
 #line 276 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp3_) {
@@ -3430,7 +3438,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 3433 "Plugins.c"
+#line 3441 "Plugins.c"
 	}
 #line 279 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp8_ = pluggable_rep;
@@ -3440,7 +3448,7 @@ 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 3443 "Plugins.c"
+#line 3451 "Plugins.c"
 		PluginsNotifier* _tmp11_ = NULL;
 		PluginsNotifier* _tmp12_ = NULL;
 		PluginsPluggableRep* _tmp13_ = NULL;
@@ -3463,11 +3471,11 @@ void plugins_set_pluggable_enabled (const gchar* id, gboolean enabled) {
 		g_signal_emit_by_name (_tmp12_, "pluggable-activation", _tmp15_, _tmp16_);
 #line 280 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_plugins_notifier_unref0 (_tmp12_);
-#line 3466 "Plugins.c"
+#line 3474 "Plugins.c"
 	}
 #line 274 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_plugins_pluggable_rep_unref0 (pluggable_rep);
-#line 3470 "Plugins.c"
+#line 3478 "Plugins.c"
 }
 
 
@@ -3491,7 +3499,7 @@ 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 3494 "Plugins.c"
+#line 3502 "Plugins.c"
 		PluginsModuleRep* _tmp4_ = NULL;
 		GFile* _tmp5_ = NULL;
 #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3500,11 +3508,11 @@ GFile* plugins_get_pluggable_module_file (SpitPluggable* pluggable) {
 		_tmp5_ = _tmp4_->file;
 #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp2_ = _tmp5_;
-#line 3503 "Plugins.c"
+#line 3511 "Plugins.c"
 	} else {
 #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp2_ = NULL;
-#line 3507 "Plugins.c"
+#line 3515 "Plugins.c"
 	}
 #line 286 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp6_ = _g_object_ref0 (_tmp2_);
@@ -3514,7 +3522,7 @@ 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 3517 "Plugins.c"
+#line 3525 "Plugins.c"
 }
 
 
@@ -3545,7 +3553,7 @@ gint plugins_compare_pluggable_names (void* a, void* b) {
 	result = _tmp4_;
 #line 293 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 3548 "Plugins.c"
+#line 3556 "Plugins.c"
 }
 
 
@@ -3582,7 +3590,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 3585 "Plugins.c"
+#line 3593 "Plugins.c"
 }
 
 
@@ -3615,7 +3623,7 @@ gboolean plugins_is_shared_library (GFile* file) {
 	ext = _tmp4_;
 #line 305 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_free0 (_tmp2_);
-#line 3618 "Plugins.c"
+#line 3626 "Plugins.c"
 	{
 		const gchar** shared_ext_collection = NULL;
 		gint shared_ext_collection_length1 = 0;
@@ -3627,14 +3635,14 @@ 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 3630 "Plugins.c"
+#line 3638 "Plugins.c"
 			gchar* _tmp5_ = NULL;
 			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 3637 "Plugins.c"
+#line 3645 "Plugins.c"
 			{
 				const gchar* _tmp6_ = NULL;
 				const gchar* _tmp7_ = NULL;
@@ -3654,11 +3662,11 @@ gboolean plugins_is_shared_library (GFile* file) {
 					_g_free0 (name);
 #line 309 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					return result;
-#line 3657 "Plugins.c"
+#line 3665 "Plugins.c"
 				}
 #line 307 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				_g_free0 (shared_ext);
-#line 3661 "Plugins.c"
+#line 3669 "Plugins.c"
 			}
 		}
 	}
@@ -3670,7 +3678,7 @@ gboolean plugins_is_shared_library (GFile* file) {
 	_g_free0 (name);
 #line 312 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	return result;
-#line 3673 "Plugins.c"
+#line 3681 "Plugins.c"
 }
 
 
@@ -3706,7 +3714,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 3709 "Plugins.c"
+#line 3717 "Plugins.c"
 	}
 	{
 		gboolean _tmp5_ = FALSE;
@@ -3714,7 +3722,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 		_tmp5_ = TRUE;
 #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		while (TRUE) {
-#line 3717 "Plugins.c"
+#line 3725 "Plugins.c"
 			GFileInfo* info = NULL;
 			GFileEnumerator* _tmp6_ = NULL;
 			GFileInfo* _tmp7_ = NULL;
@@ -3730,7 +3738,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 			GFileType _tmp16_ = 0;
 #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			if (!_tmp5_) {
-#line 3733 "Plugins.c"
+#line 3741 "Plugins.c"
 			}
 #line 322 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp5_ = FALSE;
@@ -3748,7 +3756,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 3751 "Plugins.c"
+#line 3759 "Plugins.c"
 			}
 #line 324 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp8_ = info;
@@ -3758,7 +3766,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 3761 "Plugins.c"
+#line 3769 "Plugins.c"
 			}
 #line 327 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp9_ = info;
@@ -3770,7 +3778,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 3773 "Plugins.c"
+#line 3781 "Plugins.c"
 			}
 #line 330 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp11_ = dir;
@@ -3790,7 +3798,7 @@ 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 3793 "Plugins.c"
+#line 3801 "Plugins.c"
 				{
 					{
 						GFile* _tmp17_ = NULL;
@@ -3800,7 +3808,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 						plugins_search_for_plugins (_tmp17_, &_inner_error_);
 #line 335 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3803 "Plugins.c"
+#line 3811 "Plugins.c"
 							goto __catch36_g_error;
 						}
 					}
@@ -3833,7 +3841,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 3836 "Plugins.c"
+#line 3844 "Plugins.c"
 					}
 					__finally36:
 #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3848,15 +3856,15 @@ 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 3851 "Plugins.c"
+#line 3859 "Plugins.c"
 					}
 #line 339 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					break;
-#line 3855 "Plugins.c"
+#line 3863 "Plugins.c"
 				}
 #line 332 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				case G_FILE_TYPE_REGULAR:
-#line 3859 "Plugins.c"
+#line 3867 "Plugins.c"
 				{
 					GFile* _tmp23_ = NULL;
 					gboolean _tmp24_ = FALSE;
@@ -3866,35 +3874,35 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 					_tmp24_ = plugins_is_shared_library (_tmp23_);
 #line 342 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					if (_tmp24_) {
-#line 3869 "Plugins.c"
+#line 3877 "Plugins.c"
 						GFile* _tmp25_ = NULL;
 #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 3875 "Plugins.c"
+#line 3883 "Plugins.c"
 					}
 #line 344 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					break;
-#line 3879 "Plugins.c"
+#line 3887 "Plugins.c"
 				}
 				default:
 				{
 #line 348 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					break;
-#line 3885 "Plugins.c"
+#line 3893 "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 3892 "Plugins.c"
+#line 3900 "Plugins.c"
 		}
 	}
 #line 315 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_object_unref0 (enumerator);
-#line 3897 "Plugins.c"
+#line 3905 "Plugins.c"
 }
 
 
@@ -3971,7 +3979,7 @@ void plugins_load_module (GFile* file) {
 	_tmp2_ = module_rep;
 #line 355 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp2_ == NULL) {
-#line 3974 "Plugins.c"
+#line 3982 "Plugins.c"
 		GFile* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -3992,7 +4000,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 3995 "Plugins.c"
+#line 4003 "Plugins.c"
 	}
 #line 363 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp7_ = module_rep;
@@ -4004,7 +4012,7 @@ void plugins_load_module (GFile* file) {
 	entry = _tmp9_;
 #line 363 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (!_tmp10_) {
-#line 4007 "Plugins.c"
+#line 4015 "Plugins.c"
 		GFile* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
@@ -4023,7 +4031,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 4025 "Plugins.c"
+#line 4033 "Plugins.c"
 	}
 #line 370 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp14_ = entry;
@@ -4033,11 +4041,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 4035 "Plugins.c"
+#line 4043 "Plugins.c"
 	} else {
 #line 372 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp15_ = FALSE;
-#line 4039 "Plugins.c"
+#line 4047 "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");
@@ -4073,7 +4081,7 @@ 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 4075 "Plugins.c"
+#line 4083 "Plugins.c"
 		GFile* _tmp23_ = NULL;
 		gchar* _tmp24_ = NULL;
 		gchar* _tmp25_ = NULL;
@@ -4094,7 +4102,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 4095 "Plugins.c"
+#line 4103 "Plugins.c"
 	}
 #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp27_ = params;
@@ -4104,7 +4112,7 @@ 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 4105 "Plugins.c"
+#line 4113 "Plugins.c"
 	} else {
 		SpitEntryPointParams _tmp29_ = {0};
 		gint _tmp30_ = 0;
@@ -4114,11 +4122,11 @@ void plugins_load_module (GFile* file) {
 		_tmp30_ = _tmp29_.module_spit_interface;
 #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp26_ = _tmp30_ > PLUGINS_MAX_SPIT_INTERFACE;
-#line 4115 "Plugins.c"
+#line 4123 "Plugins.c"
 	}
 #line 387 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp26_) {
-#line 4119 "Plugins.c"
+#line 4127 "Plugins.c"
 		GFile* _tmp31_ = NULL;
 		gchar* _tmp32_ = NULL;
 		gchar* _tmp33_ = NULL;
@@ -4145,7 +4153,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 4145 "Plugins.c"
+#line 4153 "Plugins.c"
 	}
 #line 394 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp36_ = module_rep;
@@ -4161,7 +4169,7 @@ 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 4161 "Plugins.c"
+#line 4169 "Plugins.c"
 		PluginsModuleRep* _tmp41_ = NULL;
 #line 398 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp41_ = module_rep;
@@ -4169,7 +4177,7 @@ void plugins_load_module (GFile* file) {
 		_g_object_unref0 (_tmp41_->spit_module);
 #line 398 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 		_tmp41_->spit_module = NULL;
-#line 4169 "Plugins.c"
+#line 4177 "Plugins.c"
 	}
 #line 400 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp42_ = module_rep;
@@ -4177,7 +4185,7 @@ void plugins_load_module (GFile* file) {
 	_tmp43_ = _tmp42_->spit_module;
 #line 400 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp43_ == NULL) {
-#line 4177 "Plugins.c"
+#line 4185 "Plugins.c"
 		GFile* _tmp44_ = NULL;
 		gchar* _tmp45_ = NULL;
 		gchar* _tmp46_ = NULL;
@@ -4204,7 +4212,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 4203 "Plugins.c"
+#line 4211 "Plugins.c"
 	}
 #line 409 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp49_ = module_rep;
@@ -4226,7 +4234,7 @@ void plugins_load_module (GFile* file) {
 	_tmp55_ = _tmp54_->id;
 #line 410 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if (_tmp55_ == NULL) {
-#line 4225 "Plugins.c"
+#line 4233 "Plugins.c"
 		GFile* _tmp56_ = NULL;
 		gchar* _tmp57_ = NULL;
 		gchar* _tmp58_ = NULL;
@@ -4253,7 +4261,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 4251 "Plugins.c"
+#line 4259 "Plugins.c"
 	}
 #line 417 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp61_ = plugins_module_table;
@@ -4265,7 +4273,7 @@ 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 4263 "Plugins.c"
+#line 4271 "Plugins.c"
 		GFile* _tmp65_ = NULL;
 		gchar* _tmp66_ = NULL;
 		gchar* _tmp67_ = NULL;
@@ -4298,7 +4306,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 4295 "Plugins.c"
+#line 4303 "Plugins.c"
 	}
 #line 424 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp72_ = module_rep;
@@ -4342,7 +4350,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 4339 "Plugins.c"
+#line 4347 "Plugins.c"
 	{
 		SpitPluggable** pluggable_collection = NULL;
 		gint pluggable_collection_length1 = 0;
@@ -4354,14 +4362,14 @@ 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 4351 "Plugins.c"
+#line 4359 "Plugins.c"
 			SpitPluggable* _tmp91_ = NULL;
 			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 4358 "Plugins.c"
+#line 4366 "Plugins.c"
 			{
 				GeeHashMap* _tmp92_ = NULL;
 				SpitPluggable* _tmp93_ = NULL;
@@ -4387,7 +4395,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 4384 "Plugins.c"
+#line 4392 "Plugins.c"
 			}
 		}
 	}
@@ -4395,7 +4403,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 4392 "Plugins.c"
+#line 4400 "Plugins.c"
 }
 
 
diff --git a/src/plugins/PublishingInterfaces.c b/src/plugins/PublishingInterfaces.c
index 4dfb6a4..bb5d614 100644
--- a/src/plugins/PublishingInterfaces.c
+++ b/src/plugins/PublishingInterfaces.c
@@ -1,4 +1,4 @@
-/* PublishingInterfaces.c generated by valac 0.34.4, the Vala compiler
+/* PublishingInterfaces.c generated by valac 0.34.7, the Vala compiler
  * generated from PublishingInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/plugins/SpitInterfaces.c b/src/plugins/SpitInterfaces.c
index dc6fb3b..7c1d3cc 100644
--- a/src/plugins/SpitInterfaces.c
+++ b/src/plugins/SpitInterfaces.c
@@ -1,4 +1,4 @@
-/* SpitInterfaces.c generated by valac 0.34.4, the Vala compiler
+/* SpitInterfaces.c generated by valac 0.34.7, the Vala compiler
  * generated from SpitInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/plugins/StandardHostInterface.c b/src/plugins/StandardHostInterface.c
index 497024d..1694df3 100644
--- a/src/plugins/StandardHostInterface.c
+++ b/src/plugins/StandardHostInterface.c
@@ -1,4 +1,4 @@
-/* StandardHostInterface.c generated by valac 0.34.4, the Vala compiler
+/* StandardHostInterface.c generated by valac 0.34.7, the Vala compiler
  * generated from StandardHostInterface.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/plugins/TransitionsInterfaces.c b/src/plugins/TransitionsInterfaces.c
index 128f648..110b59a 100644
--- a/src/plugins/TransitionsInterfaces.c
+++ b/src/plugins/TransitionsInterfaces.c
@@ -1,4 +1,4 @@
-/* TransitionsInterfaces.c generated by valac 0.34.4, the Vala compiler
+/* TransitionsInterfaces.c generated by valac 0.34.7, the Vala compiler
  * generated from TransitionsInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -698,21 +698,21 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -1208,21 +1208,21 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
diff --git a/src/publishing/APIGlue.c b/src/publishing/APIGlue.c
index f58aaba..ec2098d 100644
--- a/src/publishing/APIGlue.c
+++ b/src/publishing/APIGlue.c
@@ -1,4 +1,4 @@
-/* APIGlue.c generated by valac 0.34.4, the Vala compiler
+/* APIGlue.c generated by valac 0.34.7, the Vala compiler
  * generated from APIGlue.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1374,7 +1374,7 @@ static void publishing_glue_media_source_publishable_wrapper_instance_init (Publ
 #line 12 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self->priv->serialized_file = NULL;
 #line 13 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 13 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self->priv->param_string = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap);
 #line 1378 "APIGlue.c"
diff --git a/src/publishing/Publishing.c b/src/publishing/Publishing.c
index ca7ade6..5ee2728 100644
--- a/src/publishing/Publishing.c
+++ b/src/publishing/Publishing.c
@@ -1,4 +1,4 @@
-/* Publishing.c generated by valac 0.34.4, the Vala compiler
+/* Publishing.c generated by valac 0.34.7, the Vala compiler
  * generated from Publishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/publishing/PublishingPluginHost.c b/src/publishing/PublishingPluginHost.c
index 3fbf248..63e16c4 100644
--- a/src/publishing/PublishingPluginHost.c
+++ b/src/publishing/PublishingPluginHost.c
@@ -1,4 +1,4 @@
-/* PublishingPluginHost.c generated by valac 0.34.4, the Vala compiler
+/* PublishingPluginHost.c generated by valac 0.34.7, the Vala compiler
  * generated from PublishingPluginHost.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/publishing/PublishingUI.c b/src/publishing/PublishingUI.c
index 311216d..c54634b 100644
--- a/src/publishing/PublishingUI.c
+++ b/src/publishing/PublishingUI.c
@@ -1,4 +1,4 @@
-/* PublishingUI.c generated by valac 0.34.4, the Vala compiler
+/* PublishingUI.c generated by valac 0.34.7, the Vala compiler
  * generated from PublishingUI.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2807,11 +2807,11 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
 		}
 	}
 #line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp10_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp10_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	photos = _tmp10_;
 #line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp11_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp11_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	videos = _tmp11_;
 #line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2825,13 +2825,13 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
 #line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp15_ = photos;
 #line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp17_ = _tmp16_;
 #line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp18_ = videos;
 #line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp20_ = _tmp19_;
 #line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
diff --git a/src/searches/Branch.c b/src/searches/Branch.c
index 3abe9a9..cce6434 100644
--- a/src/searches/Branch.c
+++ b/src/searches/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.4, the Vala compiler
+/* Branch.c generated by valac 0.34.7, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -902,7 +902,7 @@ static void searches_branch_instance_init (SearchesBranch * self) {
 #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"
-	_tmp0_ = gee_hash_map_new (TYPE_SAVED_SEARCH, (GBoxedCopyFunc) g_object_ref, g_object_unref, SEARCHES_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (TYPE_SAVED_SEARCH, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, SEARCHES_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 8 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv->entry_map = _tmp0_;
 #line 909 "Branch.c"
@@ -1439,11 +1439,11 @@ static void searches_sidebar_entry_class_init (SearchesSidebarEntryClass * 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 = 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 = 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 = 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"
diff --git a/src/searches/SavedSearchDialog.c b/src/searches/SavedSearchDialog.c
index 91d066e..5050916 100644
--- a/src/searches/SavedSearchDialog.c
+++ b/src/searches/SavedSearchDialog.c
@@ -1,4 +1,4 @@
-/* SavedSearchDialog.c generated by valac 0.34.4, the Vala compiler
+/* SavedSearchDialog.c generated by valac 0.34.7, the Vala compiler
  * generated from SavedSearchDialog.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1038,7 +1038,7 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ
 #line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp24_ = self->priv->row_list;
 #line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp26_ = _tmp25_;
 #line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1361,7 +1361,7 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia
 #line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->row_list;
 #line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = _tmp1_;
 #line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1469,7 +1469,7 @@ static void saved_search_dialog_on_remove_row (SavedSearchDialog* self, SavedSea
 #line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = self->priv->row_list;
 #line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = _tmp11_;
 #line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1627,7 +1627,7 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 #line 1628 "SavedSearchDialog.c"
 		}
 #line 775 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp23_ = gee_array_list_new (TYPE_SEARCH_CONDITION, (GBoxedCopyFunc) search_condition_ref, search_condition_unref, NULL, NULL, NULL);
+		_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"
@@ -1649,7 +1649,7 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp26_ = _c_list;
 #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp27_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp27_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp28_ = _tmp27_;
 #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1972,7 +1972,7 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v)
 #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp6_ = _c_list;
 #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-					_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
+					_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp8_ = _tmp7_;
 #line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2040,7 +2040,7 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v)
 #line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp19_ = self->priv->row_list;
 #line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection));
+				_tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp21_ = _tmp20_;
 #line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2984,11 +2984,12 @@ void saved_search_dialog_search_row_populate (SavedSearchDialogSearchRow* self,
 
 
 static gboolean saved_search_dialog_search_row_real_is_complete (SavedSearchDialogSearchRow* self) {
+	gboolean _tmp0_ = FALSE;
 #line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	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 FALSE;
-#line 2992 "SavedSearchDialog.c"
+	return _tmp0_;
+#line 2993 "SavedSearchDialog.c"
 }
 
 
@@ -2997,7 +2998,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 3001 "SavedSearchDialog.c"
+#line 3002 "SavedSearchDialog.c"
 }
 
 
@@ -3007,14 +3008,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 3011 "SavedSearchDialog.c"
+#line 3012 "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 3018 "SavedSearchDialog.c"
+#line 3019 "SavedSearchDialog.c"
 }
 
 
@@ -3023,7 +3024,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 3027 "SavedSearchDialog.c"
+#line 3028 "SavedSearchDialog.c"
 	}
 }
 
@@ -3033,11 +3034,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 3037 "SavedSearchDialog.c"
+#line 3038 "SavedSearchDialog.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3041 "SavedSearchDialog.c"
+#line 3042 "SavedSearchDialog.c"
 	}
 }
 
@@ -3045,37 +3046,37 @@ 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 3049 "SavedSearchDialog.c"
+#line 3050 "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 3056 "SavedSearchDialog.c"
+#line 3057 "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 3063 "SavedSearchDialog.c"
+#line 3064 "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 3067 "SavedSearchDialog.c"
+#line 3068 "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 3071 "SavedSearchDialog.c"
+#line 3072 "SavedSearchDialog.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 3075 "SavedSearchDialog.c"
+#line 3076 "SavedSearchDialog.c"
 	}
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 3079 "SavedSearchDialog.c"
+#line 3080 "SavedSearchDialog.c"
 }
 
 
@@ -3086,25 +3087,25 @@ static gchar* saved_search_dialog_value_search_row_lcopy_value (const GValue* va
 	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 3090 "SavedSearchDialog.c"
+#line 3091 "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 3096 "SavedSearchDialog.c"
+#line 3097 "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 3100 "SavedSearchDialog.c"
+#line 3101 "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 3104 "SavedSearchDialog.c"
+#line 3105 "SavedSearchDialog.c"
 	}
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 3108 "SavedSearchDialog.c"
+#line 3109 "SavedSearchDialog.c"
 }
 
 
@@ -3118,7 +3119,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 3122 "SavedSearchDialog.c"
+#line 3123 "SavedSearchDialog.c"
 }
 
 
@@ -3127,7 +3128,7 @@ 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 3131 "SavedSearchDialog.c"
+#line 3132 "SavedSearchDialog.c"
 }
 
 
@@ -3147,17 +3148,17 @@ 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 3151 "SavedSearchDialog.c"
+#line 3152 "SavedSearchDialog.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 3155 "SavedSearchDialog.c"
+#line 3156 "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 3161 "SavedSearchDialog.c"
+#line 3162 "SavedSearchDialog.c"
 	}
 }
 
@@ -3176,17 +3177,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 3180 "SavedSearchDialog.c"
+#line 3181 "SavedSearchDialog.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 3184 "SavedSearchDialog.c"
+#line 3185 "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 3190 "SavedSearchDialog.c"
+#line 3191 "SavedSearchDialog.c"
 	}
 }
 
@@ -3197,21 +3198,21 @@ 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 = 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 = 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 = 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 = saved_search_dialog_search_row_real_is_complete;
-#line 3208 "SavedSearchDialog.c"
+	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_real_is_complete;
+#line 3209 "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 3215 "SavedSearchDialog.c"
+#line 3216 "SavedSearchDialog.c"
 }
 
 
@@ -3221,7 +3222,7 @@ static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow*
 	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 3225 "SavedSearchDialog.c"
+#line 3226 "SavedSearchDialog.c"
 }
 
 
@@ -3246,7 +3247,7 @@ static gpointer saved_search_dialog_search_row_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return instance;
-#line 3250 "SavedSearchDialog.c"
+#line 3251 "SavedSearchDialog.c"
 }
 
 
@@ -3259,7 +3260,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 3263 "SavedSearchDialog.c"
+#line 3264 "SavedSearchDialog.c"
 	}
 }
 
@@ -3267,21 +3268,21 @@ 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 3271 "SavedSearchDialog.c"
+#line 3272 "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 3278 "SavedSearchDialog.c"
+#line 3279 "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 3285 "SavedSearchDialog.c"
+#line 3286 "SavedSearchDialog.c"
 }
 
 
@@ -3432,14 +3433,14 @@ static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_const
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget));
 #line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 3436 "SavedSearchDialog.c"
+#line 3437 "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 3443 "SavedSearchDialog.c"
+#line 3444 "SavedSearchDialog.c"
 }
 
 
@@ -3458,7 +3459,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 3462 "SavedSearchDialog.c"
+#line 3463 "SavedSearchDialog.c"
 }
 
 
@@ -3506,14 +3507,14 @@ 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 3510 "SavedSearchDialog.c"
+#line 3511 "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 3517 "SavedSearchDialog.c"
+#line 3518 "SavedSearchDialog.c"
 }
 
 
@@ -3560,7 +3561,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 3564 "SavedSearchDialog.c"
+#line 3565 "SavedSearchDialog.c"
 }
 
 
@@ -3595,33 +3596,33 @@ 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 3599 "SavedSearchDialog.c"
+#line 3600 "SavedSearchDialog.c"
 	} else {
 		SearchConditionTextContext _tmp8_ = 0;
 #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 3606 "SavedSearchDialog.c"
+#line 3607 "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 3612 "SavedSearchDialog.c"
+#line 3613 "SavedSearchDialog.c"
 	} else {
 		SearchConditionTextContext _tmp9_ = 0;
 #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 3619 "SavedSearchDialog.c"
+#line 3620 "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 3625 "SavedSearchDialog.c"
+#line 3626 "SavedSearchDialog.c"
 }
 
 
@@ -3639,7 +3640,7 @@ 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 3643 "SavedSearchDialog.c"
+#line 3644 "SavedSearchDialog.c"
 }
 
 
@@ -3656,31 +3657,31 @@ 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 3660 "SavedSearchDialog.c"
+#line 3661 "SavedSearchDialog.c"
 	} else {
 		SearchConditionTextContext _tmp2_ = 0;
 #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 3667 "SavedSearchDialog.c"
+#line 3668 "SavedSearchDialog.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp0_) {
-#line 3671 "SavedSearchDialog.c"
+#line 3672 "SavedSearchDialog.c"
 		GtkEntry* _tmp3_ = NULL;
 #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 3677 "SavedSearchDialog.c"
+#line 3678 "SavedSearchDialog.c"
 	} else {
 		GtkEntry* _tmp4_ = NULL;
 #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 3684 "SavedSearchDialog.c"
+#line 3685 "SavedSearchDialog.c"
 	}
 #line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->parent;
@@ -3688,7 +3689,7 @@ static void saved_search_dialog_search_row_text_on_changed (SavedSearchDialogSea
 	_tmp6_ = self->priv->parent;
 #line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit_by_name (_tmp5_, "changed", _tmp6_);
-#line 3692 "SavedSearchDialog.c"
+#line 3693 "SavedSearchDialog.c"
 }
 
 
@@ -3700,21 +3701,21 @@ 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 = 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 = 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 = 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 = saved_search_dialog_search_row_text_real_is_complete;
-#line 3711 "SavedSearchDialog.c"
+	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_text_real_is_complete;
+#line 3712 "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 3718 "SavedSearchDialog.c"
+#line 3719 "SavedSearchDialog.c"
 }
 
 
@@ -3748,7 +3749,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 3752 "SavedSearchDialog.c"
+#line 3753 "SavedSearchDialog.c"
 }
 
 
@@ -3767,7 +3768,7 @@ 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 3771 "SavedSearchDialog.c"
+#line 3772 "SavedSearchDialog.c"
 }
 
 
@@ -3897,14 +3898,14 @@ static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
 #line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 3901 "SavedSearchDialog.c"
+#line 3902 "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 3908 "SavedSearchDialog.c"
+#line 3909 "SavedSearchDialog.c"
 }
 
 
@@ -3923,7 +3924,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 3927 "SavedSearchDialog.c"
+#line 3928 "SavedSearchDialog.c"
 }
 
 
@@ -3969,7 +3970,7 @@ 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 3973 "SavedSearchDialog.c"
+#line 3974 "SavedSearchDialog.c"
 }
 
 
@@ -4014,7 +4015,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 4018 "SavedSearchDialog.c"
+#line 4019 "SavedSearchDialog.c"
 }
 
 
@@ -4027,7 +4028,7 @@ 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 4031 "SavedSearchDialog.c"
+#line 4032 "SavedSearchDialog.c"
 }
 
 
@@ -4042,7 +4043,7 @@ static void saved_search_dialog_search_row_media_type_on_changed (SavedSearchDia
 	_tmp1_ = self->priv->parent;
 #line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit_by_name (_tmp0_, "changed", _tmp1_);
-#line 4046 "SavedSearchDialog.c"
+#line 4047 "SavedSearchDialog.c"
 }
 
 
@@ -4054,21 +4055,21 @@ 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 = 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 = 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 = 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 = saved_search_dialog_search_row_media_type_real_is_complete;
-#line 4065 "SavedSearchDialog.c"
+	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_media_type_real_is_complete;
+#line 4066 "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 4072 "SavedSearchDialog.c"
+#line 4073 "SavedSearchDialog.c"
 }
 
 
@@ -4102,7 +4103,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 4106 "SavedSearchDialog.c"
+#line 4107 "SavedSearchDialog.c"
 }
 
 
@@ -4121,7 +4122,7 @@ 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 4125 "SavedSearchDialog.c"
+#line 4126 "SavedSearchDialog.c"
 }
 
 
@@ -4251,14 +4252,14 @@ static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modifi
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
 #line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 4255 "SavedSearchDialog.c"
+#line 4256 "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 4262 "SavedSearchDialog.c"
+#line 4263 "SavedSearchDialog.c"
 }
 
 
@@ -4277,7 +4278,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 4281 "SavedSearchDialog.c"
+#line 4282 "SavedSearchDialog.c"
 }
 
 
@@ -4323,7 +4324,7 @@ 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 4327 "SavedSearchDialog.c"
+#line 4328 "SavedSearchDialog.c"
 }
 
 
@@ -4368,7 +4369,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 4372 "SavedSearchDialog.c"
+#line 4373 "SavedSearchDialog.c"
 }
 
 
@@ -4381,7 +4382,7 @@ 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 4385 "SavedSearchDialog.c"
+#line 4386 "SavedSearchDialog.c"
 }
 
 
@@ -4396,7 +4397,7 @@ static void saved_search_dialog_search_row_modified_on_changed (SavedSearchDialo
 	_tmp1_ = self->priv->parent;
 #line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit_by_name (_tmp0_, "changed", _tmp1_);
-#line 4400 "SavedSearchDialog.c"
+#line 4401 "SavedSearchDialog.c"
 }
 
 
@@ -4408,21 +4409,21 @@ 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 = 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 = 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 = 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 = saved_search_dialog_search_row_modified_real_is_complete;
-#line 4419 "SavedSearchDialog.c"
+	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_modified_real_is_complete;
+#line 4420 "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 4426 "SavedSearchDialog.c"
+#line 4427 "SavedSearchDialog.c"
 }
 
 
@@ -4456,7 +4457,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 4460 "SavedSearchDialog.c"
+#line 4461 "SavedSearchDialog.c"
 }
 
 
@@ -4475,7 +4476,7 @@ 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 4479 "SavedSearchDialog.c"
+#line 4480 "SavedSearchDialog.c"
 }
 
 
@@ -4572,14 +4573,14 @@ static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget));
 #line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 4576 "SavedSearchDialog.c"
+#line 4577 "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 4583 "SavedSearchDialog.c"
+#line 4584 "SavedSearchDialog.c"
 }
 
 
@@ -4598,7 +4599,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 4602 "SavedSearchDialog.c"
+#line 4603 "SavedSearchDialog.c"
 }
 
 
@@ -4635,7 +4636,7 @@ 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 4639 "SavedSearchDialog.c"
+#line 4640 "SavedSearchDialog.c"
 }
 
 
@@ -4669,7 +4670,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 4673 "SavedSearchDialog.c"
+#line 4674 "SavedSearchDialog.c"
 }
 
 
@@ -4682,7 +4683,7 @@ 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 4686 "SavedSearchDialog.c"
+#line 4687 "SavedSearchDialog.c"
 }
 
 
@@ -4697,7 +4698,7 @@ static void saved_search_dialog_search_row_flagged_on_changed (SavedSearchDialog
 	_tmp1_ = self->priv->parent;
 #line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit_by_name (_tmp0_, "changed", _tmp1_);
-#line 4701 "SavedSearchDialog.c"
+#line 4702 "SavedSearchDialog.c"
 }
 
 
@@ -4709,21 +4710,21 @@ 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 = 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 = 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 = 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 = saved_search_dialog_search_row_flagged_real_is_complete;
-#line 4720 "SavedSearchDialog.c"
+	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_flagged_real_is_complete;
+#line 4721 "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 4727 "SavedSearchDialog.c"
+#line 4728 "SavedSearchDialog.c"
 }
 
 
@@ -4747,7 +4748,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 4751 "SavedSearchDialog.c"
+#line 4752 "SavedSearchDialog.c"
 }
 
 
@@ -4766,7 +4767,7 @@ 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 4770 "SavedSearchDialog.c"
+#line 4771 "SavedSearchDialog.c"
 }
 
 
@@ -4954,14 +4955,14 @@ static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_c
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget));
 #line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 4958 "SavedSearchDialog.c"
+#line 4959 "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 4965 "SavedSearchDialog.c"
+#line 4966 "SavedSearchDialog.c"
 }
 
 
@@ -4980,7 +4981,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 4984 "SavedSearchDialog.c"
+#line 4985 "SavedSearchDialog.c"
 }
 
 
@@ -5026,7 +5027,7 @@ 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 5030 "SavedSearchDialog.c"
+#line 5031 "SavedSearchDialog.c"
 }
 
 
@@ -5071,7 +5072,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 5075 "SavedSearchDialog.c"
+#line 5076 "SavedSearchDialog.c"
 }
 
 
@@ -5084,7 +5085,7 @@ 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 5088 "SavedSearchDialog.c"
+#line 5089 "SavedSearchDialog.c"
 }
 
 
@@ -5099,7 +5100,7 @@ static void saved_search_dialog_search_row_rating_on_changed (SavedSearchDialogS
 	_tmp1_ = self->priv->parent;
 #line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit_by_name (_tmp0_, "changed", _tmp1_);
-#line 5103 "SavedSearchDialog.c"
+#line 5104 "SavedSearchDialog.c"
 }
 
 
@@ -5111,21 +5112,21 @@ 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 = 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 = 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 = 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 = saved_search_dialog_search_row_rating_real_is_complete;
-#line 5122 "SavedSearchDialog.c"
+	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_rating_real_is_complete;
+#line 5123 "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 5129 "SavedSearchDialog.c"
+#line 5130 "SavedSearchDialog.c"
 }
 
 
@@ -5159,7 +5160,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 5163 "SavedSearchDialog.c"
+#line 5164 "SavedSearchDialog.c"
 }
 
 
@@ -5178,21 +5179,21 @@ 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 5182 "SavedSearchDialog.c"
+#line 5183 "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 5189 "SavedSearchDialog.c"
+#line 5190 "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 5196 "SavedSearchDialog.c"
+#line 5197 "SavedSearchDialog.c"
 }
 
 
@@ -5379,14 +5380,14 @@ static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_const
 	saved_search_dialog_search_row_date_update_date_labels (self);
 #line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 5383 "SavedSearchDialog.c"
+#line 5384 "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 5390 "SavedSearchDialog.c"
+#line 5391 "SavedSearchDialog.c"
 }
 
 
@@ -5417,7 +5418,7 @@ 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 5421 "SavedSearchDialog.c"
+#line 5422 "SavedSearchDialog.c"
 		GtkButton* _tmp3_ = NULL;
 		GtkLabel* _tmp4_ = NULL;
 		GtkButton* _tmp5_ = NULL;
@@ -5433,14 +5434,14 @@ 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 5437 "SavedSearchDialog.c"
+#line 5438 "SavedSearchDialog.c"
 	} else {
 		SearchConditionDateContext _tmp6_ = 0;
 #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 5444 "SavedSearchDialog.c"
+#line 5445 "SavedSearchDialog.c"
 			GtkButton* _tmp7_ = NULL;
 			GtkLabel* _tmp8_ = NULL;
 			GtkButton* _tmp9_ = NULL;
@@ -5456,7 +5457,7 @@ 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 5460 "SavedSearchDialog.c"
+#line 5461 "SavedSearchDialog.c"
 		} else {
 			GtkButton* _tmp10_ = NULL;
 			GtkLabel* _tmp11_ = NULL;
@@ -5473,7 +5474,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 5477 "SavedSearchDialog.c"
+#line 5478 "SavedSearchDialog.c"
 		}
 	}
 #line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5508,7 +5509,7 @@ 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 5512 "SavedSearchDialog.c"
+#line 5513 "SavedSearchDialog.c"
 }
 
 
@@ -5527,7 +5528,7 @@ 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 5531 "SavedSearchDialog.c"
+#line 5532 "SavedSearchDialog.c"
 }
 
 
@@ -5569,7 +5570,7 @@ 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 5573 "SavedSearchDialog.c"
+#line 5574 "SavedSearchDialog.c"
 }
 
 
@@ -5611,7 +5612,7 @@ 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 5615 "SavedSearchDialog.c"
+#line 5616 "SavedSearchDialog.c"
 }
 
 
@@ -5653,7 +5654,7 @@ 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 5657 "SavedSearchDialog.c"
+#line 5658 "SavedSearchDialog.c"
 }
 
 
@@ -5695,7 +5696,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 5699 "SavedSearchDialog.c"
+#line 5700 "SavedSearchDialog.c"
 }
 
 
@@ -5751,7 +5752,7 @@ 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 5755 "SavedSearchDialog.c"
+#line 5756 "SavedSearchDialog.c"
 }
 
 
@@ -5803,7 +5804,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 5807 "SavedSearchDialog.c"
+#line 5808 "SavedSearchDialog.c"
 }
 
 
@@ -5816,7 +5817,7 @@ 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 5820 "SavedSearchDialog.c"
+#line 5821 "SavedSearchDialog.c"
 }
 
 
@@ -5833,7 +5834,7 @@ static void saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSea
 	g_signal_emit_by_name (_tmp0_, "changed", _tmp1_);
 #line 596 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 5837 "SavedSearchDialog.c"
+#line 5838 "SavedSearchDialog.c"
 }
 
 
@@ -5842,7 +5843,7 @@ static Block9Data* block9_data_ref (Block9Data* _data9_) {
 	g_atomic_int_inc (&_data9_->_ref_count_);
 #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return _data9_;
-#line 5846 "SavedSearchDialog.c"
+#line 5847 "SavedSearchDialog.c"
 }
 
 
@@ -5851,7 +5852,7 @@ static void block9_data_unref (void * _userdata_) {
 	_data9_ = (Block9Data*) _userdata_;
 #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) {
-#line 5855 "SavedSearchDialog.c"
+#line 5856 "SavedSearchDialog.c"
 		SavedSearchDialogSearchRowDate* self;
 #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		self = _data9_->self;
@@ -5861,7 +5862,7 @@ static void block9_data_unref (void * _userdata_) {
 		_saved_search_dialog_search_row_unref0 (self);
 #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_slice_free (Block9Data, _data9_);
-#line 5865 "SavedSearchDialog.c"
+#line 5866 "SavedSearchDialog.c"
 	}
 }
 
@@ -5869,14 +5870,14 @@ static void block9_data_unref (void * _userdata_) {
 static void __lambda12_ (SavedSearchDialogSearchRowDate* self) {
 #line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 5873 "SavedSearchDialog.c"
+#line 5874 "SavedSearchDialog.c"
 }
 
 
 static void ___lambda12__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) {
 #line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	__lambda12_ ((SavedSearchDialogSearchRowDate*) self);
-#line 5880 "SavedSearchDialog.c"
+#line 5881 "SavedSearchDialog.c"
 }
 
 
@@ -5889,14 +5890,14 @@ static void __lambda13_ (Block9Data* _data9_) {
 	_tmp0_ = _data9_->d;
 #line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_dialog_response (_tmp0_, (gint) GTK_RESPONSE_ACCEPT);
-#line 5893 "SavedSearchDialog.c"
+#line 5894 "SavedSearchDialog.c"
 }
 
 
 static void ___lambda13__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self) {
 #line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	__lambda13_ (self);
-#line 5900 "SavedSearchDialog.c"
+#line 5901 "SavedSearchDialog.c"
 }
 
 
@@ -6023,7 +6024,7 @@ 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 6027 "SavedSearchDialog.c"
+#line 6028 "SavedSearchDialog.c"
 		GtkCalendar* _tmp24_ = NULL;
 		gint _tmp25_ = 0;
 		GtkCalendar* _tmp26_ = NULL;
@@ -6048,7 +6049,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 6052 "SavedSearchDialog.c"
+#line 6053 "SavedSearchDialog.c"
 	}
 #line 622 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp30_ = cal;
@@ -6072,7 +6073,7 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo
 	block9_data_unref (_data9_);
 #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_data9_ = NULL;
-#line 6076 "SavedSearchDialog.c"
+#line 6077 "SavedSearchDialog.c"
 }
 
 
@@ -6084,7 +6085,7 @@ static void saved_search_dialog_search_row_date_on_one_clicked (SavedSearchDialo
 	_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 6088 "SavedSearchDialog.c"
+#line 6089 "SavedSearchDialog.c"
 }
 
 
@@ -6096,7 +6097,7 @@ static void saved_search_dialog_search_row_date_on_two_clicked (SavedSearchDialo
 	_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 6100 "SavedSearchDialog.c"
+#line 6101 "SavedSearchDialog.c"
 }
 
 
@@ -6108,21 +6109,21 @@ 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 = 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 = 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 = 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 = saved_search_dialog_search_row_date_real_is_complete;
-#line 6119 "SavedSearchDialog.c"
+	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*)(SavedSearchDialogSearchRow*)) saved_search_dialog_search_row_date_real_is_complete;
+#line 6120 "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 6126 "SavedSearchDialog.c"
+#line 6127 "SavedSearchDialog.c"
 }
 
 
@@ -6156,7 +6157,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 6160 "SavedSearchDialog.c"
+#line 6161 "SavedSearchDialog.c"
 }
 
 
@@ -6175,7 +6176,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 6179 "SavedSearchDialog.c"
+#line 6180 "SavedSearchDialog.c"
 }
 
 
@@ -6184,7 +6185,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 6188 "SavedSearchDialog.c"
+#line 6189 "SavedSearchDialog.c"
 	}
 }
 
@@ -6194,11 +6195,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 6198 "SavedSearchDialog.c"
+#line 6199 "SavedSearchDialog.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6202 "SavedSearchDialog.c"
+#line 6203 "SavedSearchDialog.c"
 	}
 }
 
@@ -6206,37 +6207,37 @@ 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 6210 "SavedSearchDialog.c"
+#line 6211 "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 6217 "SavedSearchDialog.c"
+#line 6218 "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 6224 "SavedSearchDialog.c"
+#line 6225 "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 6228 "SavedSearchDialog.c"
+#line 6229 "SavedSearchDialog.c"
 		}
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = saved_search_dialog_ref (object);
-#line 6232 "SavedSearchDialog.c"
+#line 6233 "SavedSearchDialog.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 6236 "SavedSearchDialog.c"
+#line 6237 "SavedSearchDialog.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 6240 "SavedSearchDialog.c"
+#line 6241 "SavedSearchDialog.c"
 }
 
 
@@ -6247,25 +6248,25 @@ static gchar* value_saved_search_dialog_lcopy_value (const GValue* value, guint
 	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 6251 "SavedSearchDialog.c"
+#line 6252 "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 6257 "SavedSearchDialog.c"
+#line 6258 "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 6261 "SavedSearchDialog.c"
+#line 6262 "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 6265 "SavedSearchDialog.c"
+#line 6266 "SavedSearchDialog.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 6269 "SavedSearchDialog.c"
+#line 6270 "SavedSearchDialog.c"
 }
 
 
@@ -6279,7 +6280,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 6283 "SavedSearchDialog.c"
+#line 6284 "SavedSearchDialog.c"
 }
 
 
@@ -6288,7 +6289,7 @@ 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 6292 "SavedSearchDialog.c"
+#line 6293 "SavedSearchDialog.c"
 }
 
 
@@ -6308,17 +6309,17 @@ 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 6312 "SavedSearchDialog.c"
+#line 6313 "SavedSearchDialog.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 6316 "SavedSearchDialog.c"
+#line 6317 "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 6322 "SavedSearchDialog.c"
+#line 6323 "SavedSearchDialog.c"
 	}
 }
 
@@ -6337,17 +6338,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 6341 "SavedSearchDialog.c"
+#line 6342 "SavedSearchDialog.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 6345 "SavedSearchDialog.c"
+#line 6346 "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 6351 "SavedSearchDialog.c"
+#line 6352 "SavedSearchDialog.c"
 	}
 }
 
@@ -6359,7 +6360,7 @@ 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 6363 "SavedSearchDialog.c"
+#line 6364 "SavedSearchDialog.c"
 }
 
 
@@ -6368,7 +6369,7 @@ static void saved_search_dialog_instance_init (SavedSearchDialog * self) {
 #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"
-	_tmp0_ = gee_array_list_new (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, (GBoxedCopyFunc) saved_search_dialog_search_row_container_ref, saved_search_dialog_search_row_container_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, (GBoxedCopyFunc) saved_search_dialog_search_row_container_ref, (GDestroyNotify) saved_search_dialog_search_row_container_unref, NULL, NULL, NULL);
 #line 643 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->row_list = _tmp0_;
 #line 644 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -6379,7 +6380,7 @@ 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 6383 "SavedSearchDialog.c"
+#line 6384 "SavedSearchDialog.c"
 }
 
 
@@ -6413,7 +6414,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 6417 "SavedSearchDialog.c"
+#line 6418 "SavedSearchDialog.c"
 }
 
 
@@ -6438,7 +6439,7 @@ gpointer saved_search_dialog_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return instance;
-#line 6442 "SavedSearchDialog.c"
+#line 6443 "SavedSearchDialog.c"
 }
 
 
@@ -6451,7 +6452,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 6455 "SavedSearchDialog.c"
+#line 6456 "SavedSearchDialog.c"
 	}
 }
 
diff --git a/src/searches/SavedSearchPage.c b/src/searches/SavedSearchPage.c
index d9e8593..2f44fd0 100644
--- a/src/searches/SavedSearchPage.c
+++ b/src/searches/SavedSearchPage.c
@@ -1,4 +1,4 @@
-/* SavedSearchPage.c generated by valac 0.34.4, the Vala compiler
+/* SavedSearchPage.c generated by valac 0.34.7, the Vala compiler
  * generated from SavedSearchPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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"
 }
 
@@ -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 = 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 = 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 = 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 = 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 = 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 = 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"
diff --git a/src/searches/SearchBoolean.c b/src/searches/SearchBoolean.c
index 15a6e82..2667236 100644
--- a/src/searches/SearchBoolean.c
+++ b/src/searches/SearchBoolean.c
@@ -1,4 +1,4 @@
-/* SearchBoolean.c generated by valac 0.34.4, the Vala compiler
+/* SearchBoolean.c generated by valac 0.34.7, the Vala compiler
  * generated from SearchBoolean.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1714,11 +1714,12 @@ GType search_condition_search_type_get_type (void) {
 
 
 static gboolean search_condition_real_predicate (SearchCondition* self, MediaSource* source) {
+	gboolean _tmp0_ = FALSE;
 #line 198 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	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 FALSE;
-#line 1722 "SearchBoolean.c"
+	return _tmp0_;
+#line 1723 "SearchBoolean.c"
 }
 
 
@@ -1727,7 +1728,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 1731 "SearchBoolean.c"
+#line 1732 "SearchBoolean.c"
 }
 
 
@@ -1737,7 +1738,7 @@ 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 1741 "SearchBoolean.c"
+#line 1742 "SearchBoolean.c"
 }
 
 
@@ -1752,7 +1753,7 @@ SearchConditionSearchType search_condition_get_search_type (SearchCondition* sel
 	result = _tmp0_;
 #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 1756 "SearchBoolean.c"
+#line 1757 "SearchBoolean.c"
 }
 
 
@@ -1764,14 +1765,14 @@ void search_condition_set_search_type (SearchCondition* self, SearchConditionSea
 	_tmp0_ = value;
 #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_search_type = _tmp0_;
-#line 1768 "SearchBoolean.c"
+#line 1769 "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 1775 "SearchBoolean.c"
+#line 1776 "SearchBoolean.c"
 }
 
 
@@ -1780,7 +1781,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 1784 "SearchBoolean.c"
+#line 1785 "SearchBoolean.c"
 	}
 }
 
@@ -1790,11 +1791,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 1794 "SearchBoolean.c"
+#line 1795 "SearchBoolean.c"
 	} else {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1798 "SearchBoolean.c"
+#line 1799 "SearchBoolean.c"
 	}
 }
 
@@ -1802,37 +1803,37 @@ 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 1806 "SearchBoolean.c"
+#line 1807 "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 1813 "SearchBoolean.c"
+#line 1814 "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 1820 "SearchBoolean.c"
+#line 1821 "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 1824 "SearchBoolean.c"
+#line 1825 "SearchBoolean.c"
 		}
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = search_condition_ref (object);
-#line 1828 "SearchBoolean.c"
+#line 1829 "SearchBoolean.c"
 	} else {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = NULL;
-#line 1832 "SearchBoolean.c"
+#line 1833 "SearchBoolean.c"
 	}
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return NULL;
-#line 1836 "SearchBoolean.c"
+#line 1837 "SearchBoolean.c"
 }
 
 
@@ -1843,25 +1844,25 @@ static gchar* value_search_condition_lcopy_value (const GValue* value, guint n_c
 	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 1847 "SearchBoolean.c"
+#line 1848 "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 1853 "SearchBoolean.c"
+#line 1854 "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 1857 "SearchBoolean.c"
+#line 1858 "SearchBoolean.c"
 	} else {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		*object_p = search_condition_ref (value->data[0].v_pointer);
-#line 1861 "SearchBoolean.c"
+#line 1862 "SearchBoolean.c"
 	}
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return NULL;
-#line 1865 "SearchBoolean.c"
+#line 1866 "SearchBoolean.c"
 }
 
 
@@ -1875,7 +1876,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 1879 "SearchBoolean.c"
+#line 1880 "SearchBoolean.c"
 }
 
 
@@ -1884,7 +1885,7 @@ 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 1888 "SearchBoolean.c"
+#line 1889 "SearchBoolean.c"
 }
 
 
@@ -1904,17 +1905,17 @@ 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 1908 "SearchBoolean.c"
+#line 1909 "SearchBoolean.c"
 	} else {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = NULL;
-#line 1912 "SearchBoolean.c"
+#line 1913 "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 1918 "SearchBoolean.c"
+#line 1919 "SearchBoolean.c"
 	}
 }
 
@@ -1933,17 +1934,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 1937 "SearchBoolean.c"
+#line 1938 "SearchBoolean.c"
 	} else {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = NULL;
-#line 1941 "SearchBoolean.c"
+#line 1942 "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 1947 "SearchBoolean.c"
+#line 1948 "SearchBoolean.c"
 	}
 }
 
@@ -1956,8 +1957,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 = search_condition_real_predicate;
-#line 1961 "SearchBoolean.c"
+	((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_real_predicate;
+#line 1962 "SearchBoolean.c"
 }
 
 
@@ -1966,7 +1967,7 @@ 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 1970 "SearchBoolean.c"
+#line 1971 "SearchBoolean.c"
 }
 
 
@@ -1976,7 +1977,7 @@ static void search_condition_finalize (SearchCondition* obj) {
 	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 1980 "SearchBoolean.c"
+#line 1981 "SearchBoolean.c"
 }
 
 
@@ -2001,7 +2002,7 @@ gpointer search_condition_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return instance;
-#line 2005 "SearchBoolean.c"
+#line 2006 "SearchBoolean.c"
 }
 
 
@@ -2014,7 +2015,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 2018 "SearchBoolean.c"
+#line 2019 "SearchBoolean.c"
 	}
 }
 
@@ -2025,7 +2026,7 @@ 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 2029 "SearchBoolean.c"
+#line 2030 "SearchBoolean.c"
 		{
 			gchar* _tmp0_ = NULL;
 #line 215 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2034,11 +2035,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self)
 			result = _tmp0_;
 #line 215 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2038 "SearchBoolean.c"
+#line 2039 "SearchBoolean.c"
 		}
 #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY:
-#line 2042 "SearchBoolean.c"
+#line 2043 "SearchBoolean.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 218 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2047,11 +2048,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self)
 			result = _tmp1_;
 #line 218 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2051 "SearchBoolean.c"
+#line 2052 "SearchBoolean.c"
 		}
 #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH:
-#line 2055 "SearchBoolean.c"
+#line 2056 "SearchBoolean.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 221 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2060,11 +2061,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self)
 			result = _tmp2_;
 #line 221 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2064 "SearchBoolean.c"
+#line 2065 "SearchBoolean.c"
 		}
 #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH:
-#line 2068 "SearchBoolean.c"
+#line 2069 "SearchBoolean.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 224 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2073,11 +2074,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self)
 			result = _tmp3_;
 #line 224 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2077 "SearchBoolean.c"
+#line 2078 "SearchBoolean.c"
 		}
 #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN:
-#line 2081 "SearchBoolean.c"
+#line 2082 "SearchBoolean.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 227 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2086,11 +2087,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self)
 			result = _tmp4_;
 #line 227 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2090 "SearchBoolean.c"
+#line 2091 "SearchBoolean.c"
 		}
 #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET:
-#line 2094 "SearchBoolean.c"
+#line 2095 "SearchBoolean.c"
 		{
 			gchar* _tmp5_ = NULL;
 #line 230 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2099,11 +2100,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self)
 			result = _tmp5_;
 #line 230 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2103 "SearchBoolean.c"
+#line 2104 "SearchBoolean.c"
 		}
 #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_IS_SET:
-#line 2107 "SearchBoolean.c"
+#line 2108 "SearchBoolean.c"
 		{
 			gchar* _tmp6_ = NULL;
 #line 233 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2112,14 +2113,14 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self)
 			result = _tmp6_;
 #line 233 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2116 "SearchBoolean.c"
+#line 2117 "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 2122 "SearchBoolean.c"
+#line 2123 "SearchBoolean.c"
 		}
 	}
 }
@@ -2138,7 +2139,7 @@ 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 2141 "SearchBoolean.c"
+#line 2142 "SearchBoolean.c"
 	} else {
 		const gchar* _tmp1_ = NULL;
 #line 244 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2149,7 +2150,7 @@ 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 2152 "SearchBoolean.c"
+#line 2153 "SearchBoolean.c"
 		} else {
 			const gchar* _tmp2_ = NULL;
 #line 247 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2160,7 +2161,7 @@ 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 2163 "SearchBoolean.c"
+#line 2164 "SearchBoolean.c"
 			} else {
 				const gchar* _tmp3_ = NULL;
 #line 250 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2171,7 +2172,7 @@ 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 2174 "SearchBoolean.c"
+#line 2175 "SearchBoolean.c"
 				} else {
 					const gchar* _tmp4_ = NULL;
 #line 253 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2182,7 +2183,7 @@ 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 2185 "SearchBoolean.c"
+#line 2186 "SearchBoolean.c"
 					} else {
 						const gchar* _tmp5_ = NULL;
 #line 256 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2193,7 +2194,7 @@ 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 2196 "SearchBoolean.c"
+#line 2197 "SearchBoolean.c"
 						} else {
 							const gchar* _tmp6_ = NULL;
 #line 259 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2204,14 +2205,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 2207 "SearchBoolean.c"
+#line 2208 "SearchBoolean.c"
 							} else {
 								const gchar* _tmp7_ = NULL;
 #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 2214 "SearchBoolean.c"
+#line 2215 "SearchBoolean.c"
 							}
 						}
 					}
@@ -2250,7 +2251,7 @@ 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 2253 "SearchBoolean.c"
+#line 2254 "SearchBoolean.c"
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -2269,7 +2270,7 @@ 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 2272 "SearchBoolean.c"
+#line 2273 "SearchBoolean.c"
 	} else {
 		gchar* _tmp7_ = NULL;
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2278,7 +2279,7 @@ SearchConditionText* search_condition_text_construct (GType object_type, SearchC
 		_g_free0 (_tmp1_);
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp1_ = _tmp7_;
-#line 2281 "SearchBoolean.c"
+#line 2282 "SearchBoolean.c"
 	}
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	search_condition_text_set_text (self, _tmp1_);
@@ -2290,14 +2291,14 @@ 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 2293 "SearchBoolean.c"
+#line 2294 "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 2300 "SearchBoolean.c"
+#line 2301 "SearchBoolean.c"
 }
 
 
@@ -2317,7 +2318,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2320 "SearchBoolean.c"
+#line 2321 "SearchBoolean.c"
 }
 
 
@@ -2336,7 +2337,7 @@ 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 2339 "SearchBoolean.c"
+#line 2340 "SearchBoolean.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			const gchar* _tmp2_ = NULL;
@@ -2347,7 +2348,7 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c
 			_tmp3_ = is_string_empty (_tmp2_);
 #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (!_tmp3_) {
-#line 2350 "SearchBoolean.c"
+#line 2351 "SearchBoolean.c"
 				const gchar* _tmp4_ = NULL;
 				const gchar* _tmp5_ = NULL;
 				gboolean _tmp6_ = FALSE;
@@ -2359,21 +2360,21 @@ 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 2362 "SearchBoolean.c"
+#line 2363 "SearchBoolean.c"
 			} else {
 #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp1_ = FALSE;
-#line 2366 "SearchBoolean.c"
+#line 2367 "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 2372 "SearchBoolean.c"
+#line 2373 "SearchBoolean.c"
 		}
 #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY:
-#line 2376 "SearchBoolean.c"
+#line 2377 "SearchBoolean.c"
 		{
 			gboolean _tmp7_ = FALSE;
 			const gchar* _tmp8_ = NULL;
@@ -2384,7 +2385,7 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c
 			_tmp9_ = is_string_empty (_tmp8_);
 #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (!_tmp9_) {
-#line 2387 "SearchBoolean.c"
+#line 2388 "SearchBoolean.c"
 				const gchar* _tmp10_ = NULL;
 				const gchar* _tmp11_ = NULL;
 #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2393,21 +2394,21 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c
 				_tmp11_ = needle;
 #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp7_ = g_strcmp0 (_tmp10_, _tmp11_) == 0;
-#line 2396 "SearchBoolean.c"
+#line 2397 "SearchBoolean.c"
 			} else {
 #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp7_ = FALSE;
-#line 2400 "SearchBoolean.c"
+#line 2401 "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 2406 "SearchBoolean.c"
+#line 2407 "SearchBoolean.c"
 		}
 #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH:
-#line 2410 "SearchBoolean.c"
+#line 2411 "SearchBoolean.c"
 		{
 			gboolean _tmp12_ = FALSE;
 			const gchar* _tmp13_ = NULL;
@@ -2418,7 +2419,7 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c
 			_tmp14_ = is_string_empty (_tmp13_);
 #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (!_tmp14_) {
-#line 2421 "SearchBoolean.c"
+#line 2422 "SearchBoolean.c"
 				const gchar* _tmp15_ = NULL;
 				const gchar* _tmp16_ = NULL;
 				gboolean _tmp17_ = FALSE;
@@ -2430,21 +2431,21 @@ 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 2433 "SearchBoolean.c"
+#line 2434 "SearchBoolean.c"
 			} else {
 #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp12_ = FALSE;
-#line 2437 "SearchBoolean.c"
+#line 2438 "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 2443 "SearchBoolean.c"
+#line 2444 "SearchBoolean.c"
 		}
 #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH:
-#line 2447 "SearchBoolean.c"
+#line 2448 "SearchBoolean.c"
 		{
 			gboolean _tmp18_ = FALSE;
 			const gchar* _tmp19_ = NULL;
@@ -2455,7 +2456,7 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c
 			_tmp20_ = is_string_empty (_tmp19_);
 #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (!_tmp20_) {
-#line 2458 "SearchBoolean.c"
+#line 2459 "SearchBoolean.c"
 				const gchar* _tmp21_ = NULL;
 				const gchar* _tmp22_ = NULL;
 				gboolean _tmp23_ = FALSE;
@@ -2467,21 +2468,21 @@ 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 2470 "SearchBoolean.c"
+#line 2471 "SearchBoolean.c"
 			} else {
 #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp18_ = FALSE;
-#line 2474 "SearchBoolean.c"
+#line 2475 "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 2480 "SearchBoolean.c"
+#line 2481 "SearchBoolean.c"
 		}
 #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET:
-#line 2484 "SearchBoolean.c"
+#line 2485 "SearchBoolean.c"
 		{
 			const gchar* _tmp24_ = NULL;
 			gboolean _tmp25_ = FALSE;
@@ -2493,11 +2494,11 @@ 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 2496 "SearchBoolean.c"
+#line 2497 "SearchBoolean.c"
 		}
 #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_IS_SET:
-#line 2500 "SearchBoolean.c"
+#line 2501 "SearchBoolean.c"
 		{
 			const gchar* _tmp26_ = NULL;
 			gboolean _tmp27_ = FALSE;
@@ -2509,25 +2510,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 2512 "SearchBoolean.c"
+#line 2513 "SearchBoolean.c"
 		}
 		default:
 #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		break;
-#line 2517 "SearchBoolean.c"
+#line 2518 "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 2523 "SearchBoolean.c"
+#line 2524 "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 2530 "SearchBoolean.c"
+#line 2531 "SearchBoolean.c"
 }
 
 
@@ -2566,7 +2567,7 @@ 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 2569 "SearchBoolean.c"
+#line 2570 "SearchBoolean.c"
 	} else {
 		SearchConditionSearchType _tmp3_ = 0;
 		SearchConditionSearchType _tmp4_ = 0;
@@ -2576,11 +2577,11 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 		_tmp4_ = _tmp3_;
 #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp0_ = SEARCH_CONDITION_SEARCH_TYPE_TITLE == _tmp4_;
-#line 2579 "SearchBoolean.c"
+#line 2580 "SearchBoolean.c"
 	}
 #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp0_) {
-#line 2583 "SearchBoolean.c"
+#line 2584 "SearchBoolean.c"
 		gchar* _tmp5_ = NULL;
 		MediaSource* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
@@ -2604,7 +2605,7 @@ 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 2607 "SearchBoolean.c"
+#line 2608 "SearchBoolean.c"
 			MediaSource* _tmp10_ = NULL;
 			gchar* _tmp11_ = NULL;
 			gchar* _tmp12_ = NULL;
@@ -2631,13 +2632,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 2634 "SearchBoolean.c"
+#line 2635 "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 2640 "SearchBoolean.c"
+#line 2641 "SearchBoolean.c"
 		}
 #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp16_ = g_strdup (_tmp5_);
@@ -2657,7 +2658,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 2660 "SearchBoolean.c"
+#line 2661 "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));
@@ -2667,7 +2668,7 @@ 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 2670 "SearchBoolean.c"
+#line 2671 "SearchBoolean.c"
 	} else {
 		SearchConditionSearchType _tmp24_ = 0;
 		SearchConditionSearchType _tmp25_ = 0;
@@ -2677,11 +2678,11 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 		_tmp25_ = _tmp24_;
 #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp21_ = SEARCH_CONDITION_SEARCH_TYPE_TAG == _tmp25_;
-#line 2680 "SearchBoolean.c"
+#line 2681 "SearchBoolean.c"
 	}
 #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp21_) {
-#line 2684 "SearchBoolean.c"
+#line 2685 "SearchBoolean.c"
 		GeeList* tag_list = NULL;
 		TagSourceCollection* _tmp26_ = NULL;
 		MediaSource* _tmp27_ = NULL;
@@ -2699,7 +2700,7 @@ 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 2702 "SearchBoolean.c"
+#line 2703 "SearchBoolean.c"
 			gchar* itag = NULL;
 			{
 				GeeList* _tag_list = NULL;
@@ -2728,7 +2729,7 @@ 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 2731 "SearchBoolean.c"
+#line 2732 "SearchBoolean.c"
 					gint _tmp35_ = 0;
 					gint _tmp36_ = 0;
 					gint _tmp37_ = 0;
@@ -2756,7 +2757,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 2759 "SearchBoolean.c"
+#line 2760 "SearchBoolean.c"
 					}
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					_tmp38_ = _tag_list;
@@ -2792,15 +2793,15 @@ 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 2795 "SearchBoolean.c"
+#line 2796 "SearchBoolean.c"
 				}
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_g_object_unref0 (_tag_list);
-#line 2799 "SearchBoolean.c"
+#line 2800 "SearchBoolean.c"
 			}
 #line 319 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_free0 (itag);
-#line 2803 "SearchBoolean.c"
+#line 2804 "SearchBoolean.c"
 		} else {
 			gboolean _tmp49_ = FALSE;
 			const gchar* _tmp50_ = NULL;
@@ -2813,11 +2814,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 2816 "SearchBoolean.c"
+#line 2817 "SearchBoolean.c"
 		}
 #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_object_unref0 (tag_list);
-#line 2820 "SearchBoolean.c"
+#line 2821 "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));
@@ -2827,7 +2828,7 @@ 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 2830 "SearchBoolean.c"
+#line 2831 "SearchBoolean.c"
 	} else {
 		SearchConditionSearchType _tmp55_ = 0;
 		SearchConditionSearchType _tmp56_ = 0;
@@ -2837,11 +2838,11 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 		_tmp56_ = _tmp55_;
 #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp52_ = SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME == _tmp56_;
-#line 2840 "SearchBoolean.c"
+#line 2841 "SearchBoolean.c"
 	}
 #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp52_) {
-#line 2844 "SearchBoolean.c"
+#line 2845 "SearchBoolean.c"
 		gchar* _tmp57_ = NULL;
 		MediaSource* _tmp58_ = NULL;
 		Event* _tmp59_ = NULL;
@@ -2865,7 +2866,7 @@ 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 2868 "SearchBoolean.c"
+#line 2869 "SearchBoolean.c"
 			MediaSource* _tmp62_ = NULL;
 			Event* _tmp63_ = NULL;
 			Event* _tmp64_ = NULL;
@@ -2900,13 +2901,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 2903 "SearchBoolean.c"
+#line 2904 "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 2909 "SearchBoolean.c"
+#line 2910 "SearchBoolean.c"
 		}
 #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp70_ = g_strdup (_tmp57_);
@@ -2926,7 +2927,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 2929 "SearchBoolean.c"
+#line 2930 "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));
@@ -2936,7 +2937,7 @@ 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 2939 "SearchBoolean.c"
+#line 2940 "SearchBoolean.c"
 	} else {
 		SearchConditionSearchType _tmp78_ = 0;
 		SearchConditionSearchType _tmp79_ = 0;
@@ -2946,11 +2947,11 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 		_tmp79_ = _tmp78_;
 #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp75_ = SEARCH_CONDITION_SEARCH_TYPE_COMMENT == _tmp79_;
-#line 2949 "SearchBoolean.c"
+#line 2950 "SearchBoolean.c"
 	}
 #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp75_) {
-#line 2953 "SearchBoolean.c"
+#line 2954 "SearchBoolean.c"
 		gchar* comment = NULL;
 		MediaSource* _tmp80_ = NULL;
 		gchar* _tmp81_ = NULL;
@@ -2965,7 +2966,7 @@ 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 2968 "SearchBoolean.c"
+#line 2969 "SearchBoolean.c"
 			gboolean _tmp83_ = FALSE;
 			const gchar* _tmp84_ = NULL;
 			const gchar* _tmp85_ = NULL;
@@ -2996,11 +2997,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 2999 "SearchBoolean.c"
+#line 3000 "SearchBoolean.c"
 		}
 #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_free0 (comment);
-#line 3003 "SearchBoolean.c"
+#line 3004 "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));
@@ -3010,7 +3011,7 @@ 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 3013 "SearchBoolean.c"
+#line 3014 "SearchBoolean.c"
 	} else {
 		SearchConditionSearchType _tmp94_ = 0;
 		SearchConditionSearchType _tmp95_ = 0;
@@ -3020,11 +3021,11 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 		_tmp95_ = _tmp94_;
 #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp91_ = SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME == _tmp95_;
-#line 3023 "SearchBoolean.c"
+#line 3024 "SearchBoolean.c"
 	}
 #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp91_) {
-#line 3027 "SearchBoolean.c"
+#line 3028 "SearchBoolean.c"
 		gboolean _tmp96_ = FALSE;
 		const gchar* _tmp97_ = NULL;
 		MediaSource* _tmp98_ = NULL;
@@ -3063,32 +3064,32 @@ 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 3066 "SearchBoolean.c"
+#line 3067 "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 3072 "SearchBoolean.c"
+#line 3073 "SearchBoolean.c"
 		gboolean _tmp108_ = FALSE;
 #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 3078 "SearchBoolean.c"
+#line 3079 "SearchBoolean.c"
 	} else {
 		gboolean _tmp109_ = FALSE;
 #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 3085 "SearchBoolean.c"
+#line 3086 "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 3091 "SearchBoolean.c"
+#line 3092 "SearchBoolean.c"
 }
 
 
@@ -3103,7 +3104,7 @@ const gchar* search_condition_text_get_text (SearchConditionText* self) {
 	result = _tmp0_;
 #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 3106 "SearchBoolean.c"
+#line 3107 "SearchBoolean.c"
 }
 
 
@@ -3120,7 +3121,7 @@ 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 3123 "SearchBoolean.c"
+#line 3124 "SearchBoolean.c"
 }
 
 
@@ -3135,7 +3136,7 @@ SearchConditionTextContext search_condition_text_get_context (SearchConditionTex
 	result = _tmp0_;
 #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 3138 "SearchBoolean.c"
+#line 3139 "SearchBoolean.c"
 }
 
 
@@ -3147,7 +3148,7 @@ static void search_condition_text_set_context (SearchConditionText* self, Search
 	_tmp0_ = value;
 #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_context = _tmp0_;
-#line 3150 "SearchBoolean.c"
+#line 3151 "SearchBoolean.c"
 }
 
 
@@ -3159,15 +3160,15 @@ 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 = search_condition_text_real_predicate;
-#line 3163 "SearchBoolean.c"
+	((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_text_real_predicate;
+#line 3164 "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 3170 "SearchBoolean.c"
+#line 3171 "SearchBoolean.c"
 }
 
 
@@ -3179,7 +3180,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 3182 "SearchBoolean.c"
+#line 3183 "SearchBoolean.c"
 }
 
 
@@ -3201,7 +3202,7 @@ 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 3204 "SearchBoolean.c"
+#line 3205 "SearchBoolean.c"
 		{
 			gchar* _tmp0_ = NULL;
 #line 362 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3210,11 +3211,11 @@ gchar* search_condition_media_type_context_to_string (SearchConditionMediaTypeCo
 			result = _tmp0_;
 #line 362 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3213 "SearchBoolean.c"
+#line 3214 "SearchBoolean.c"
 		}
 #line 360 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT:
-#line 3217 "SearchBoolean.c"
+#line 3218 "SearchBoolean.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 365 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3223,14 +3224,14 @@ gchar* search_condition_media_type_context_to_string (SearchConditionMediaTypeCo
 			result = _tmp1_;
 #line 365 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3226 "SearchBoolean.c"
+#line 3227 "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 3232 "SearchBoolean.c"
+#line 3233 "SearchBoolean.c"
 		}
 	}
 }
@@ -3249,7 +3250,7 @@ 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 3251 "SearchBoolean.c"
+#line 3252 "SearchBoolean.c"
 	} else {
 		const gchar* _tmp1_ = NULL;
 #line 376 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3260,14 +3261,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 3262 "SearchBoolean.c"
+#line 3263 "SearchBoolean.c"
 		} else {
 			const gchar* _tmp2_ = NULL;
 #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 3269 "SearchBoolean.c"
+#line 3270 "SearchBoolean.c"
 		}
 	}
 }
@@ -3291,7 +3292,7 @@ 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 3293 "SearchBoolean.c"
+#line 3294 "SearchBoolean.c"
 		{
 			gchar* _tmp0_ = NULL;
 #line 392 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3300,11 +3301,11 @@ gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTyp
 			result = _tmp0_;
 #line 392 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3302 "SearchBoolean.c"
+#line 3303 "SearchBoolean.c"
 		}
 #line 390 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW:
-#line 3306 "SearchBoolean.c"
+#line 3307 "SearchBoolean.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 395 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3313,11 +3314,11 @@ gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTyp
 			result = _tmp1_;
 #line 395 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3315 "SearchBoolean.c"
+#line 3316 "SearchBoolean.c"
 		}
 #line 390 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO:
-#line 3319 "SearchBoolean.c"
+#line 3320 "SearchBoolean.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 398 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3326,14 +3327,14 @@ gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTyp
 			result = _tmp2_;
 #line 398 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3328 "SearchBoolean.c"
+#line 3329 "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 3334 "SearchBoolean.c"
+#line 3335 "SearchBoolean.c"
 		}
 	}
 }
@@ -3352,7 +3353,7 @@ 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 3353 "SearchBoolean.c"
+#line 3354 "SearchBoolean.c"
 	} else {
 		const gchar* _tmp1_ = NULL;
 #line 409 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3363,7 +3364,7 @@ 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 3364 "SearchBoolean.c"
+#line 3365 "SearchBoolean.c"
 		} else {
 			const gchar* _tmp2_ = NULL;
 #line 412 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3374,14 +3375,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 3375 "SearchBoolean.c"
+#line 3376 "SearchBoolean.c"
 			} else {
 				const gchar* _tmp3_ = NULL;
 #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 3382 "SearchBoolean.c"
+#line 3383 "SearchBoolean.c"
 			}
 		}
 	}
@@ -3421,14 +3422,14 @@ 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 3422 "SearchBoolean.c"
+#line 3423 "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 3429 "SearchBoolean.c"
+#line 3430 "SearchBoolean.c"
 }
 
 
@@ -3446,14 +3447,14 @@ 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 3447 "SearchBoolean.c"
+#line 3448 "SearchBoolean.c"
 		{
 			MediaSource* _tmp1_ = NULL;
 #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 3454 "SearchBoolean.c"
+#line 3455 "SearchBoolean.c"
 				SearchConditionMediaTypeContext _tmp2_ = 0;
 #line 439 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp2_ = self->priv->_context;
@@ -3461,7 +3462,7 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas
 				result = _tmp2_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS;
 #line 439 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 3462 "SearchBoolean.c"
+#line 3463 "SearchBoolean.c"
 			} else {
 				SearchConditionMediaTypeContext _tmp3_ = 0;
 #line 441 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3470,12 +3471,12 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas
 				result = _tmp3_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT;
 #line 441 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 3471 "SearchBoolean.c"
+#line 3472 "SearchBoolean.c"
 			}
 		}
 #line 436 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW:
-#line 3476 "SearchBoolean.c"
+#line 3477 "SearchBoolean.c"
 		{
 			gboolean _tmp4_ = FALSE;
 			MediaSource* _tmp5_ = NULL;
@@ -3483,7 +3484,7 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas
 			_tmp5_ = source;
 #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_PHOTO)) {
-#line 3484 "SearchBoolean.c"
+#line 3485 "SearchBoolean.c"
 				MediaSource* _tmp6_ = NULL;
 				PhotoFileFormat _tmp7_ = 0;
 #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3492,15 +3493,15 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas
 				_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 3493 "SearchBoolean.c"
+#line 3494 "SearchBoolean.c"
 			} else {
 #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp4_ = FALSE;
-#line 3497 "SearchBoolean.c"
+#line 3498 "SearchBoolean.c"
 			}
 #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_tmp4_) {
-#line 3501 "SearchBoolean.c"
+#line 3502 "SearchBoolean.c"
 				SearchConditionMediaTypeContext _tmp8_ = 0;
 #line 445 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp8_ = self->priv->_context;
@@ -3508,7 +3509,7 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas
 				result = _tmp8_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS;
 #line 445 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 3509 "SearchBoolean.c"
+#line 3510 "SearchBoolean.c"
 			} else {
 				SearchConditionMediaTypeContext _tmp9_ = 0;
 #line 447 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3517,19 +3518,19 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas
 				result = _tmp9_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT;
 #line 447 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 3518 "SearchBoolean.c"
+#line 3519 "SearchBoolean.c"
 			}
 		}
 #line 436 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO:
-#line 3523 "SearchBoolean.c"
+#line 3524 "SearchBoolean.c"
 		{
 			MediaSource* _tmp10_ = NULL;
 #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 3530 "SearchBoolean.c"
+#line 3531 "SearchBoolean.c"
 				SearchConditionMediaTypeContext _tmp11_ = 0;
 #line 451 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp11_ = self->priv->_context;
@@ -3537,7 +3538,7 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas
 				result = _tmp11_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS;
 #line 451 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 3538 "SearchBoolean.c"
+#line 3539 "SearchBoolean.c"
 			} else {
 				SearchConditionMediaTypeContext _tmp12_ = 0;
 #line 453 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3546,7 +3547,7 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas
 				result = _tmp12_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT;
 #line 453 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 3547 "SearchBoolean.c"
+#line 3548 "SearchBoolean.c"
 			}
 		}
 		default:
@@ -3554,7 +3555,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 3554 "SearchBoolean.c"
+#line 3555 "SearchBoolean.c"
 		}
 	}
 }
@@ -3571,7 +3572,7 @@ SearchConditionMediaTypeMediaType search_condition_media_type_get_media_type (Se
 	result = _tmp0_;
 #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 3571 "SearchBoolean.c"
+#line 3572 "SearchBoolean.c"
 }
 
 
@@ -3583,7 +3584,7 @@ static void search_condition_media_type_set_media_type (SearchConditionMediaType
 	_tmp0_ = value;
 #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_media_type = _tmp0_;
-#line 3583 "SearchBoolean.c"
+#line 3584 "SearchBoolean.c"
 }
 
 
@@ -3598,7 +3599,7 @@ SearchConditionMediaTypeContext search_condition_media_type_get_context (SearchC
 	result = _tmp0_;
 #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 3598 "SearchBoolean.c"
+#line 3599 "SearchBoolean.c"
 }
 
 
@@ -3610,7 +3611,7 @@ static void search_condition_media_type_set_context (SearchConditionMediaType* s
 	_tmp0_ = value;
 #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_context = _tmp0_;
-#line 3610 "SearchBoolean.c"
+#line 3611 "SearchBoolean.c"
 }
 
 
@@ -3622,15 +3623,15 @@ 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 = search_condition_media_type_real_predicate;
-#line 3623 "SearchBoolean.c"
+	((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_media_type_real_predicate;
+#line 3624 "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 3630 "SearchBoolean.c"
+#line 3631 "SearchBoolean.c"
 }
 
 
@@ -3640,7 +3641,7 @@ static void search_condition_media_type_finalize (SearchCondition* obj) {
 	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 3640 "SearchBoolean.c"
+#line 3641 "SearchBoolean.c"
 }
 
 
@@ -3662,7 +3663,7 @@ 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 3662 "SearchBoolean.c"
+#line 3663 "SearchBoolean.c"
 		{
 			gchar* _tmp0_ = NULL;
 #line 470 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3671,11 +3672,11 @@ gchar* search_condition_flagged_state_to_string (SearchConditionFlaggedState sel
 			result = _tmp0_;
 #line 470 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3671 "SearchBoolean.c"
+#line 3672 "SearchBoolean.c"
 		}
 #line 468 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED:
-#line 3675 "SearchBoolean.c"
+#line 3676 "SearchBoolean.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 473 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3684,14 +3685,14 @@ gchar* search_condition_flagged_state_to_string (SearchConditionFlaggedState sel
 			result = _tmp1_;
 #line 473 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3684 "SearchBoolean.c"
+#line 3685 "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 3690 "SearchBoolean.c"
+#line 3691 "SearchBoolean.c"
 		}
 	}
 }
@@ -3710,7 +3711,7 @@ 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 3709 "SearchBoolean.c"
+#line 3710 "SearchBoolean.c"
 	} else {
 		const gchar* _tmp1_ = NULL;
 #line 484 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3721,14 +3722,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 3720 "SearchBoolean.c"
+#line 3721 "SearchBoolean.c"
 		} else {
 			const gchar* _tmp2_ = NULL;
 #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 3727 "SearchBoolean.c"
+#line 3728 "SearchBoolean.c"
 		}
 	}
 }
@@ -3762,14 +3763,14 @@ 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 3761 "SearchBoolean.c"
+#line 3762 "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 3768 "SearchBoolean.c"
+#line 3769 "SearchBoolean.c"
 }
 
 
@@ -3785,7 +3786,7 @@ 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 3784 "SearchBoolean.c"
+#line 3785 "SearchBoolean.c"
 		MediaSource* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
 #line 503 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3796,14 +3797,14 @@ static gboolean search_condition_flagged_real_predicate (SearchCondition* base,
 		result = _tmp2_;
 #line 503 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 3795 "SearchBoolean.c"
+#line 3796 "SearchBoolean.c"
 	} else {
 		SearchConditionFlaggedState _tmp3_ = 0;
 #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 3802 "SearchBoolean.c"
+#line 3803 "SearchBoolean.c"
 			MediaSource* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
 #line 505 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3814,11 +3815,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 3813 "SearchBoolean.c"
+#line 3814 "SearchBoolean.c"
 		} else {
 #line 507 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:507: unrecognized flagged search state");
-#line 3817 "SearchBoolean.c"
+#line 3818 "SearchBoolean.c"
 		}
 	}
 }
@@ -3835,7 +3836,7 @@ SearchConditionFlaggedState search_condition_flagged_get_state (SearchConditionF
 	result = _tmp0_;
 #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 3834 "SearchBoolean.c"
+#line 3835 "SearchBoolean.c"
 }
 
 
@@ -3847,7 +3848,7 @@ static void search_condition_flagged_set_state (SearchConditionFlagged* self, Se
 	_tmp0_ = value;
 #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_state = _tmp0_;
-#line 3846 "SearchBoolean.c"
+#line 3847 "SearchBoolean.c"
 }
 
 
@@ -3859,15 +3860,15 @@ 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 = search_condition_flagged_real_predicate;
-#line 3859 "SearchBoolean.c"
+	((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_flagged_real_predicate;
+#line 3860 "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 3866 "SearchBoolean.c"
+#line 3867 "SearchBoolean.c"
 }
 
 
@@ -3877,7 +3878,7 @@ static void search_condition_flagged_finalize (SearchCondition* obj) {
 	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 3876 "SearchBoolean.c"
+#line 3877 "SearchBoolean.c"
 }
 
 
@@ -3899,7 +3900,7 @@ 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 3898 "SearchBoolean.c"
+#line 3899 "SearchBoolean.c"
 		{
 			gchar* _tmp0_ = NULL;
 #line 522 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3908,11 +3909,11 @@ gchar* search_condition_modified_context_to_string (SearchConditionModifiedConte
 			result = _tmp0_;
 #line 522 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3907 "SearchBoolean.c"
+#line 3908 "SearchBoolean.c"
 		}
 #line 520 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MODIFIED_CONTEXT_HAS_NO:
-#line 3911 "SearchBoolean.c"
+#line 3912 "SearchBoolean.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 525 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3921,14 +3922,14 @@ gchar* search_condition_modified_context_to_string (SearchConditionModifiedConte
 			result = _tmp1_;
 #line 525 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3920 "SearchBoolean.c"
+#line 3921 "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 3926 "SearchBoolean.c"
+#line 3927 "SearchBoolean.c"
 		}
 	}
 }
@@ -3947,7 +3948,7 @@ 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 3945 "SearchBoolean.c"
+#line 3946 "SearchBoolean.c"
 	} else {
 		const gchar* _tmp1_ = NULL;
 #line 536 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3958,14 +3959,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 3956 "SearchBoolean.c"
+#line 3957 "SearchBoolean.c"
 		} else {
 			const gchar* _tmp2_ = NULL;
 #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 3963 "SearchBoolean.c"
+#line 3964 "SearchBoolean.c"
 		}
 	}
 }
@@ -3989,7 +3990,7 @@ 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 3987 "SearchBoolean.c"
+#line 3988 "SearchBoolean.c"
 		{
 			gchar* _tmp0_ = NULL;
 #line 552 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3998,11 +3999,11 @@ gchar* search_condition_modified_state_to_string (SearchConditionModifiedState s
 			result = _tmp0_;
 #line 552 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3996 "SearchBoolean.c"
+#line 3997 "SearchBoolean.c"
 		}
 #line 550 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MODIFIED_STATE_INTERNAL_CHANGES:
-#line 4000 "SearchBoolean.c"
+#line 4001 "SearchBoolean.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 555 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4011,11 +4012,11 @@ gchar* search_condition_modified_state_to_string (SearchConditionModifiedState s
 			result = _tmp1_;
 #line 555 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4009 "SearchBoolean.c"
+#line 4010 "SearchBoolean.c"
 		}
 #line 550 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MODIFIED_STATE_EXTERNAL_CHANGES:
-#line 4013 "SearchBoolean.c"
+#line 4014 "SearchBoolean.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 558 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4024,14 +4025,14 @@ gchar* search_condition_modified_state_to_string (SearchConditionModifiedState s
 			result = _tmp2_;
 #line 558 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4022 "SearchBoolean.c"
+#line 4023 "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 4028 "SearchBoolean.c"
+#line 4029 "SearchBoolean.c"
 		}
 	}
 }
@@ -4050,7 +4051,7 @@ 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 4047 "SearchBoolean.c"
+#line 4048 "SearchBoolean.c"
 	} else {
 		const gchar* _tmp1_ = NULL;
 #line 569 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4061,7 +4062,7 @@ 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 4058 "SearchBoolean.c"
+#line 4059 "SearchBoolean.c"
 		} else {
 			const gchar* _tmp2_ = NULL;
 #line 572 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4072,14 +4073,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 4069 "SearchBoolean.c"
+#line 4070 "SearchBoolean.c"
 			} else {
 				const gchar* _tmp3_ = NULL;
 #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 4076 "SearchBoolean.c"
+#line 4077 "SearchBoolean.c"
 			}
 		}
 	}
@@ -4119,14 +4120,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 4116 "SearchBoolean.c"
+#line 4117 "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 4123 "SearchBoolean.c"
+#line 4124 "SearchBoolean.c"
 }
 
 
@@ -4160,13 +4161,13 @@ 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 4157 "SearchBoolean.c"
+#line 4158 "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 4163 "SearchBoolean.c"
+#line 4164 "SearchBoolean.c"
 		gboolean _tmp4_ = FALSE;
 		Photo* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
@@ -4178,7 +4179,7 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base,
 		if (_tmp6_) {
 #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp4_ = TRUE;
-#line 4175 "SearchBoolean.c"
+#line 4176 "SearchBoolean.c"
 		} else {
 			Photo* _tmp7_ = NULL;
 			gboolean _tmp8_ = FALSE;
@@ -4188,18 +4189,18 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base,
 			_tmp8_ = photo_has_editable (_tmp7_);
 #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp4_ = _tmp8_;
-#line 4185 "SearchBoolean.c"
+#line 4186 "SearchBoolean.c"
 		}
 #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		match = _tmp4_;
-#line 4189 "SearchBoolean.c"
+#line 4190 "SearchBoolean.c"
 	} else {
 		SearchConditionModifiedState _tmp9_ = 0;
 #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 4196 "SearchBoolean.c"
+#line 4197 "SearchBoolean.c"
 			Photo* _tmp10_ = NULL;
 			gboolean _tmp11_ = FALSE;
 #line 603 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4208,14 +4209,14 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base,
 			_tmp11_ = photo_has_transformations (_tmp10_);
 #line 603 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			match = _tmp11_;
-#line 4205 "SearchBoolean.c"
+#line 4206 "SearchBoolean.c"
 		} else {
 			SearchConditionModifiedState _tmp12_ = 0;
 #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 4212 "SearchBoolean.c"
+#line 4213 "SearchBoolean.c"
 				Photo* _tmp13_ = NULL;
 				gboolean _tmp14_ = FALSE;
 #line 605 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4224,11 +4225,11 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base,
 				_tmp14_ = photo_has_editable (_tmp13_);
 #line 605 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				match = _tmp14_;
-#line 4221 "SearchBoolean.c"
+#line 4222 "SearchBoolean.c"
 			} else {
 #line 607 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				g_error ("SearchBoolean.vala:607: unrecognized modified search state");
-#line 4225 "SearchBoolean.c"
+#line 4226 "SearchBoolean.c"
 			}
 		}
 	}
@@ -4236,7 +4237,7 @@ static gboolean search_condition_modified_real_predicate (SearchCondition* base,
 	_tmp15_ = match;
 #line 609 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp15_) {
-#line 4233 "SearchBoolean.c"
+#line 4234 "SearchBoolean.c"
 		SearchConditionModifiedContext _tmp16_ = 0;
 #line 610 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp16_ = self->priv->_context;
@@ -4246,7 +4247,7 @@ 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 4243 "SearchBoolean.c"
+#line 4244 "SearchBoolean.c"
 	} else {
 		SearchConditionModifiedContext _tmp17_ = 0;
 #line 612 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4257,11 +4258,11 @@ 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 4254 "SearchBoolean.c"
+#line 4255 "SearchBoolean.c"
 	}
 #line 593 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_g_object_unref0 (photo);
-#line 4258 "SearchBoolean.c"
+#line 4259 "SearchBoolean.c"
 }
 
 
@@ -4276,7 +4277,7 @@ SearchConditionModifiedState search_condition_modified_get_state (SearchConditio
 	result = _tmp0_;
 #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 4273 "SearchBoolean.c"
+#line 4274 "SearchBoolean.c"
 }
 
 
@@ -4288,7 +4289,7 @@ static void search_condition_modified_set_state (SearchConditionModified* self,
 	_tmp0_ = value;
 #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_state = _tmp0_;
-#line 4285 "SearchBoolean.c"
+#line 4286 "SearchBoolean.c"
 }
 
 
@@ -4303,7 +4304,7 @@ SearchConditionModifiedContext search_condition_modified_get_context (SearchCond
 	result = _tmp0_;
 #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 4300 "SearchBoolean.c"
+#line 4301 "SearchBoolean.c"
 }
 
 
@@ -4315,7 +4316,7 @@ static void search_condition_modified_set_context (SearchConditionModified* self
 	_tmp0_ = value;
 #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_context = _tmp0_;
-#line 4312 "SearchBoolean.c"
+#line 4313 "SearchBoolean.c"
 }
 
 
@@ -4327,15 +4328,15 @@ 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 = search_condition_modified_real_predicate;
-#line 4325 "SearchBoolean.c"
+	((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_modified_real_predicate;
+#line 4326 "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 4332 "SearchBoolean.c"
+#line 4333 "SearchBoolean.c"
 }
 
 
@@ -4345,7 +4346,7 @@ static void search_condition_modified_finalize (SearchCondition* obj) {
 	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 4342 "SearchBoolean.c"
+#line 4343 "SearchBoolean.c"
 }
 
 
@@ -4367,7 +4368,7 @@ 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 4364 "SearchBoolean.c"
+#line 4365 "SearchBoolean.c"
 		{
 			gchar* _tmp0_ = NULL;
 #line 627 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4376,11 +4377,11 @@ gchar* search_condition_rating_context_to_string (SearchConditionRatingContext s
 			result = _tmp0_;
 #line 627 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4373 "SearchBoolean.c"
+#line 4374 "SearchBoolean.c"
 		}
 #line 625 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_RATING_CONTEXT_ONLY:
-#line 4377 "SearchBoolean.c"
+#line 4378 "SearchBoolean.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 630 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4389,11 +4390,11 @@ gchar* search_condition_rating_context_to_string (SearchConditionRatingContext s
 			result = _tmp1_;
 #line 630 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4386 "SearchBoolean.c"
+#line 4387 "SearchBoolean.c"
 		}
 #line 625 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER:
-#line 4390 "SearchBoolean.c"
+#line 4391 "SearchBoolean.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 633 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4402,14 +4403,14 @@ gchar* search_condition_rating_context_to_string (SearchConditionRatingContext s
 			result = _tmp2_;
 #line 633 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4399 "SearchBoolean.c"
+#line 4400 "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 4405 "SearchBoolean.c"
+#line 4406 "SearchBoolean.c"
 		}
 	}
 }
@@ -4428,7 +4429,7 @@ 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 4424 "SearchBoolean.c"
+#line 4425 "SearchBoolean.c"
 	} else {
 		const gchar* _tmp1_ = NULL;
 #line 644 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4439,7 +4440,7 @@ 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 4435 "SearchBoolean.c"
+#line 4436 "SearchBoolean.c"
 		} else {
 			const gchar* _tmp2_ = NULL;
 #line 647 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4450,14 +4451,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 4446 "SearchBoolean.c"
+#line 4447 "SearchBoolean.c"
 			} else {
 				const gchar* _tmp3_ = NULL;
 #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 4453 "SearchBoolean.c"
+#line 4454 "SearchBoolean.c"
 			}
 		}
 	}
@@ -4497,14 +4498,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 4493 "SearchBoolean.c"
+#line 4494 "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 4500 "SearchBoolean.c"
+#line 4501 "SearchBoolean.c"
 }
 
 
@@ -4529,7 +4530,7 @@ 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 4525 "SearchBoolean.c"
+#line 4526 "SearchBoolean.c"
 		Rating _tmp3_ = 0;
 		Rating _tmp4_ = 0;
 #line 671 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4540,14 +4541,14 @@ 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 4536 "SearchBoolean.c"
+#line 4537 "SearchBoolean.c"
 	} else {
 		SearchConditionRatingContext _tmp5_ = 0;
 #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 4543 "SearchBoolean.c"
+#line 4544 "SearchBoolean.c"
 			Rating _tmp6_ = 0;
 			Rating _tmp7_ = 0;
 #line 673 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4558,14 +4559,14 @@ 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 4554 "SearchBoolean.c"
+#line 4555 "SearchBoolean.c"
 		} else {
 			SearchConditionRatingContext _tmp8_ = 0;
 #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 4561 "SearchBoolean.c"
+#line 4562 "SearchBoolean.c"
 				Rating _tmp9_ = 0;
 				Rating _tmp10_ = 0;
 #line 675 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4576,11 +4577,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 4572 "SearchBoolean.c"
+#line 4573 "SearchBoolean.c"
 			} else {
 #line 677 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				g_error ("SearchBoolean.vala:677: unknown rating search context");
-#line 4576 "SearchBoolean.c"
+#line 4577 "SearchBoolean.c"
 			}
 		}
 	}
@@ -4598,7 +4599,7 @@ Rating search_condition_rating_get_rating (SearchConditionRating* self) {
 	result = _tmp0_;
 #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 4594 "SearchBoolean.c"
+#line 4595 "SearchBoolean.c"
 }
 
 
@@ -4610,7 +4611,7 @@ static void search_condition_rating_set_rating (SearchConditionRating* self, Rat
 	_tmp0_ = value;
 #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_rating = _tmp0_;
-#line 4606 "SearchBoolean.c"
+#line 4607 "SearchBoolean.c"
 }
 
 
@@ -4625,7 +4626,7 @@ SearchConditionRatingContext search_condition_rating_get_context (SearchConditio
 	result = _tmp0_;
 #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 4621 "SearchBoolean.c"
+#line 4622 "SearchBoolean.c"
 }
 
 
@@ -4637,7 +4638,7 @@ static void search_condition_rating_set_context (SearchConditionRating* self, Se
 	_tmp0_ = value;
 #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_context = _tmp0_;
-#line 4633 "SearchBoolean.c"
+#line 4634 "SearchBoolean.c"
 }
 
 
@@ -4649,15 +4650,15 @@ 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 = search_condition_rating_real_predicate;
-#line 4646 "SearchBoolean.c"
+	((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_rating_real_predicate;
+#line 4647 "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 4653 "SearchBoolean.c"
+#line 4654 "SearchBoolean.c"
 }
 
 
@@ -4667,7 +4668,7 @@ static void search_condition_rating_finalize (SearchCondition* obj) {
 	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 4663 "SearchBoolean.c"
+#line 4664 "SearchBoolean.c"
 }
 
 
@@ -4689,7 +4690,7 @@ 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 4685 "SearchBoolean.c"
+#line 4686 "SearchBoolean.c"
 		{
 			gchar* _tmp0_ = NULL;
 #line 694 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4698,11 +4699,11 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self)
 			result = _tmp0_;
 #line 694 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4694 "SearchBoolean.c"
+#line 4695 "SearchBoolean.c"
 		}
 #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_AFTER:
-#line 4698 "SearchBoolean.c"
+#line 4699 "SearchBoolean.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 697 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4711,11 +4712,11 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self)
 			result = _tmp1_;
 #line 697 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4707 "SearchBoolean.c"
+#line 4708 "SearchBoolean.c"
 		}
 #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_BEFORE:
-#line 4711 "SearchBoolean.c"
+#line 4712 "SearchBoolean.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 700 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4724,11 +4725,11 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self)
 			result = _tmp2_;
 #line 700 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4720 "SearchBoolean.c"
+#line 4721 "SearchBoolean.c"
 		}
 #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_BETWEEN:
-#line 4724 "SearchBoolean.c"
+#line 4725 "SearchBoolean.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 703 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4737,11 +4738,11 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self)
 			result = _tmp3_;
 #line 703 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4733 "SearchBoolean.c"
+#line 4734 "SearchBoolean.c"
 		}
 #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET:
-#line 4737 "SearchBoolean.c"
+#line 4738 "SearchBoolean.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 706 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4750,14 +4751,14 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self)
 			result = _tmp4_;
 #line 706 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4746 "SearchBoolean.c"
+#line 4747 "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 4752 "SearchBoolean.c"
+#line 4753 "SearchBoolean.c"
 		}
 	}
 }
@@ -4777,7 +4778,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 4772 "SearchBoolean.c"
+#line 4773 "SearchBoolean.c"
 	}
 #line 717 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp1_ = str;
@@ -4787,7 +4788,7 @@ 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 4782 "SearchBoolean.c"
+#line 4783 "SearchBoolean.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
 #line 720 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4798,7 +4799,7 @@ 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 4793 "SearchBoolean.c"
+#line 4794 "SearchBoolean.c"
 		} else {
 			const gchar* _tmp3_ = NULL;
 #line 723 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4809,7 +4810,7 @@ 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 4804 "SearchBoolean.c"
+#line 4805 "SearchBoolean.c"
 			} else {
 				const gchar* _tmp4_ = NULL;
 #line 726 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4820,14 +4821,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 4815 "SearchBoolean.c"
+#line 4816 "SearchBoolean.c"
 				} else {
 					const gchar* _tmp5_ = NULL;
 #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 4822 "SearchBoolean.c"
+#line 4823 "SearchBoolean.c"
 				}
 			}
 		}
@@ -4873,7 +4874,7 @@ 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 4868 "SearchBoolean.c"
+#line 4869 "SearchBoolean.c"
 	} else {
 		GDateTime* _tmp4_ = NULL;
 		GDateTime* _tmp5_ = NULL;
@@ -4886,11 +4887,11 @@ 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 4881 "SearchBoolean.c"
+#line 4882 "SearchBoolean.c"
 	}
 #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp2_) {
-#line 4885 "SearchBoolean.c"
+#line 4886 "SearchBoolean.c"
 		GDateTime* _tmp7_ = NULL;
 		GDateTime* _tmp8_ = NULL;
 #line 746 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4901,7 +4902,7 @@ 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 4896 "SearchBoolean.c"
+#line 4897 "SearchBoolean.c"
 	} else {
 		GDateTime* _tmp9_ = NULL;
 		GDateTime* _tmp10_ = NULL;
@@ -4913,18 +4914,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 4908 "SearchBoolean.c"
+#line 4909 "SearchBoolean.c"
 	}
 #line 741 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self;
-#line 4912 "SearchBoolean.c"
+#line 4913 "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 4919 "SearchBoolean.c"
+#line 4920 "SearchBoolean.c"
 }
 
 
@@ -4953,7 +4954,7 @@ 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 4948 "SearchBoolean.c"
+#line 4949 "SearchBoolean.c"
 		SearchConditionDateContext _tmp3_ = 0;
 #line 759 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp3_ = self->priv->_context;
@@ -4961,7 +4962,7 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med
 		result = _tmp3_ == SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET;
 #line 759 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 4956 "SearchBoolean.c"
+#line 4957 "SearchBoolean.c"
 	}
 #line 761 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp4_ = exposure_time;
@@ -4975,7 +4976,7 @@ 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 4970 "SearchBoolean.c"
+#line 4971 "SearchBoolean.c"
 		{
 			GDateTime* second = NULL;
 			GDateTime* _tmp7_ = NULL;
@@ -4998,7 +4999,7 @@ 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 4993 "SearchBoolean.c"
+#line 4994 "SearchBoolean.c"
 				GDateTime* _tmp13_ = NULL;
 				GDateTime* _tmp14_ = NULL;
 				gint _tmp15_ = 0;
@@ -5010,11 +5011,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 5005 "SearchBoolean.c"
+#line 5006 "SearchBoolean.c"
 			} else {
 #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp9_ = FALSE;
-#line 5009 "SearchBoolean.c"
+#line 5010 "SearchBoolean.c"
 			}
 #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp9_;
@@ -5024,11 +5025,11 @@ 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 5019 "SearchBoolean.c"
+#line 5020 "SearchBoolean.c"
 		}
 #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_AFTER:
-#line 5023 "SearchBoolean.c"
+#line 5024 "SearchBoolean.c"
 		{
 			GDateTime* _tmp16_ = NULL;
 			GDateTime* _tmp17_ = NULL;
@@ -5045,11 +5046,11 @@ 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 5040 "SearchBoolean.c"
+#line 5041 "SearchBoolean.c"
 		}
 #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_BEFORE:
-#line 5044 "SearchBoolean.c"
+#line 5045 "SearchBoolean.c"
 		{
 			GDateTime* _tmp19_ = NULL;
 			GDateTime* _tmp20_ = NULL;
@@ -5066,11 +5067,11 @@ 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 5061 "SearchBoolean.c"
+#line 5062 "SearchBoolean.c"
 		}
 #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_BETWEEN:
-#line 5065 "SearchBoolean.c"
+#line 5066 "SearchBoolean.c"
 		{
 			GDateTime* second = NULL;
 			GDateTime* _tmp22_ = NULL;
@@ -5093,7 +5094,7 @@ 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 5088 "SearchBoolean.c"
+#line 5089 "SearchBoolean.c"
 				GDateTime* _tmp28_ = NULL;
 				GDateTime* _tmp29_ = NULL;
 				gint _tmp30_ = 0;
@@ -5105,11 +5106,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 5100 "SearchBoolean.c"
+#line 5101 "SearchBoolean.c"
 			} else {
 #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp24_ = FALSE;
-#line 5104 "SearchBoolean.c"
+#line 5105 "SearchBoolean.c"
 			}
 #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp24_;
@@ -5119,11 +5120,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 5114 "SearchBoolean.c"
+#line 5115 "SearchBoolean.c"
 		}
 #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET:
-#line 5118 "SearchBoolean.c"
+#line 5119 "SearchBoolean.c"
 		{
 #line 778 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = FALSE;
@@ -5131,19 +5132,19 @@ 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 5126 "SearchBoolean.c"
+#line 5127 "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 5132 "SearchBoolean.c"
+#line 5133 "SearchBoolean.c"
 		}
 	}
 #line 756 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_g_date_time_unref0 (dt);
-#line 5137 "SearchBoolean.c"
+#line 5138 "SearchBoolean.c"
 }
 
 
@@ -5158,14 +5159,14 @@ GDateTime* search_condition_date_get_date_one (SearchConditionDate* self) {
 	result = _tmp0_;
 #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5152 "SearchBoolean.c"
+#line 5153 "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 5159 "SearchBoolean.c"
+#line 5160 "SearchBoolean.c"
 }
 
 
@@ -5182,7 +5183,7 @@ 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 5176 "SearchBoolean.c"
+#line 5177 "SearchBoolean.c"
 }
 
 
@@ -5197,7 +5198,7 @@ GDateTime* search_condition_date_get_date_two (SearchConditionDate* self) {
 	result = _tmp0_;
 #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5191 "SearchBoolean.c"
+#line 5192 "SearchBoolean.c"
 }
 
 
@@ -5214,7 +5215,7 @@ 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 5208 "SearchBoolean.c"
+#line 5209 "SearchBoolean.c"
 }
 
 
@@ -5229,7 +5230,7 @@ SearchConditionDateContext search_condition_date_get_context (SearchConditionDat
 	result = _tmp0_;
 #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5223 "SearchBoolean.c"
+#line 5224 "SearchBoolean.c"
 }
 
 
@@ -5241,7 +5242,7 @@ static void search_condition_date_set_context (SearchConditionDate* self, Search
 	_tmp0_ = value;
 #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->_context = _tmp0_;
-#line 5235 "SearchBoolean.c"
+#line 5236 "SearchBoolean.c"
 }
 
 
@@ -5253,15 +5254,15 @@ 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 = search_condition_date_real_predicate;
-#line 5248 "SearchBoolean.c"
+	((SearchConditionClass *) klass)->predicate = (gboolean (*)(SearchCondition*, MediaSource*)) search_condition_date_real_predicate;
+#line 5249 "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 5255 "SearchBoolean.c"
+#line 5256 "SearchBoolean.c"
 }
 
 
@@ -5275,7 +5276,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 5269 "SearchBoolean.c"
+#line 5270 "SearchBoolean.c"
 }
 
 
@@ -5294,7 +5295,7 @@ 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 5288 "SearchBoolean.c"
+#line 5289 "SearchBoolean.c"
 }
 
 
@@ -5319,14 +5320,14 @@ 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 5313 "SearchBoolean.c"
+#line 5314 "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 5320 "SearchBoolean.c"
+#line 5321 "SearchBoolean.c"
 }
 
 
@@ -5348,7 +5349,7 @@ static gchar* saved_search_real_get_name (DataObject* base) {
 	result = _tmp2_;
 #line 801 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5342 "SearchBoolean.c"
+#line 5343 "SearchBoolean.c"
 }
 
 
@@ -5375,7 +5376,7 @@ static gchar* saved_search_real_to_string (DataObject* base) {
 	result = _tmp3_;
 #line 805 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5369 "SearchBoolean.c"
+#line 5370 "SearchBoolean.c"
 }
 
 
@@ -5391,7 +5392,7 @@ static gchar* saved_search_real_get_typename (DataSource* base) {
 	result = _tmp0_;
 #line 809 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5385 "SearchBoolean.c"
+#line 5386 "SearchBoolean.c"
 }
 
 
@@ -5408,7 +5409,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 5402 "SearchBoolean.c"
+#line 5403 "SearchBoolean.c"
 }
 
 
@@ -5427,7 +5428,7 @@ 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 5421 "SearchBoolean.c"
+#line 5422 "SearchBoolean.c"
 }
 
 
@@ -5458,7 +5459,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 5452 "SearchBoolean.c"
+#line 5453 "SearchBoolean.c"
 }
 
 
@@ -5480,7 +5481,7 @@ 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 5474 "SearchBoolean.c"
+#line 5475 "SearchBoolean.c"
 	} else {
 		SavedSearchRow* _tmp3_ = NULL;
 		SearchOperator _tmp4_ = 0;
@@ -5490,17 +5491,17 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) {
 		_tmp4_ = _tmp3_->operator;
 #line 829 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp0_ = SEARCH_OPERATOR_NONE == _tmp4_;
-#line 5484 "SearchBoolean.c"
+#line 5485 "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 5490 "SearchBoolean.c"
+#line 5491 "SearchBoolean.c"
 	} else {
 #line 832 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		ret = FALSE;
-#line 5494 "SearchBoolean.c"
+#line 5495 "SearchBoolean.c"
 	}
 	{
 		GeeList* _c_list = NULL;
@@ -5532,7 +5533,7 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) {
 		_c_index = -1;
 #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		while (TRUE) {
-#line 5526 "SearchBoolean.c"
+#line 5527 "SearchBoolean.c"
 			gint _tmp11_ = 0;
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
@@ -5554,7 +5555,7 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) {
 			if (!(_tmp12_ < _tmp13_)) {
 #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				break;
-#line 5548 "SearchBoolean.c"
+#line 5549 "SearchBoolean.c"
 			}
 #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp14_ = _c_list;
@@ -5570,7 +5571,7 @@ 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 5564 "SearchBoolean.c"
+#line 5565 "SearchBoolean.c"
 				gboolean _tmp19_ = FALSE;
 				SearchCondition* _tmp20_ = NULL;
 				MediaSource* _tmp21_ = NULL;
@@ -5585,7 +5586,7 @@ 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 5579 "SearchBoolean.c"
+#line 5580 "SearchBoolean.c"
 			} else {
 				SavedSearchRow* _tmp23_ = NULL;
 				SearchOperator _tmp24_ = 0;
@@ -5595,7 +5596,7 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) {
 				_tmp24_ = _tmp23_->operator;
 #line 837 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				if (SEARCH_OPERATOR_ANY == _tmp24_) {
-#line 5589 "SearchBoolean.c"
+#line 5590 "SearchBoolean.c"
 					gboolean _tmp25_ = FALSE;
 					SearchCondition* _tmp26_ = NULL;
 					MediaSource* _tmp27_ = NULL;
@@ -5610,7 +5611,7 @@ 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 5604 "SearchBoolean.c"
+#line 5605 "SearchBoolean.c"
 				} else {
 					SavedSearchRow* _tmp29_ = NULL;
 					SearchOperator _tmp30_ = 0;
@@ -5620,7 +5621,7 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) {
 					_tmp30_ = _tmp29_->operator;
 #line 839 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					if (SEARCH_OPERATOR_NONE == _tmp30_) {
-#line 5614 "SearchBoolean.c"
+#line 5615 "SearchBoolean.c"
 						gboolean _tmp31_ = FALSE;
 						SearchCondition* _tmp32_ = NULL;
 						MediaSource* _tmp33_ = NULL;
@@ -5635,23 +5636,23 @@ 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 5629 "SearchBoolean.c"
+#line 5630 "SearchBoolean.c"
 					}
 				}
 			}
 #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_search_condition_unref0 (c);
-#line 5635 "SearchBoolean.c"
+#line 5636 "SearchBoolean.c"
 		}
 #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_object_unref0 (_c_list);
-#line 5639 "SearchBoolean.c"
+#line 5640 "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 5645 "SearchBoolean.c"
+#line 5646 "SearchBoolean.c"
 }
 
 
@@ -5663,7 +5664,7 @@ void saved_search_reconstitute (SavedSearch* self) {
 	GError * _inner_error_ = NULL;
 #line 845 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (self));
-#line 5657 "SearchBoolean.c"
+#line 5658 "SearchBoolean.c"
 	{
 		SavedSearchID _tmp0_ = {0};
 		SavedSearchDBTable* _tmp1_ = NULL;
@@ -5690,7 +5691,7 @@ 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 5684 "SearchBoolean.c"
+#line 5685 "SearchBoolean.c"
 				goto __catch77_database_error;
 			}
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5699,13 +5700,13 @@ void saved_search_reconstitute (SavedSearch* self) {
 			g_clear_error (&_inner_error_);
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return;
-#line 5693 "SearchBoolean.c"
+#line 5694 "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 5699 "SearchBoolean.c"
+#line 5700 "SearchBoolean.c"
 	}
 	goto __finally77;
 	__catch77_database_error:
@@ -5722,7 +5723,7 @@ 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 5716 "SearchBoolean.c"
+#line 5717 "SearchBoolean.c"
 	}
 	__finally77:
 #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5733,7 +5734,7 @@ void saved_search_reconstitute (SavedSearch* self) {
 		g_clear_error (&_inner_error_);
 #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return;
-#line 5727 "SearchBoolean.c"
+#line 5728 "SearchBoolean.c"
 	}
 #line 852 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp8_ = saved_search_table_get_instance ();
@@ -5751,7 +5752,7 @@ 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 5745 "SearchBoolean.c"
+#line 5746 "SearchBoolean.c"
 }
 
 
@@ -5764,15 +5765,15 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 	const gchar* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
 	gboolean _tmp6_ = FALSE;
-	SavedSearchTable* _tmp13_ = NULL;
-	SavedSearchTable* _tmp14_ = NULL;
-	SavedSearchRow* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	SavedSearchTable* _tmp18_ = NULL;
-	SavedSearchTable* _tmp19_ = NULL;
-	LibraryWindow* _tmp20_ = NULL;
-	LibraryWindow* _tmp21_ = NULL;
+	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;
 	GError * _inner_error_ = NULL;
 #line 857 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (self), FALSE);
@@ -5788,7 +5789,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 5782 "SearchBoolean.c"
+#line 5783 "SearchBoolean.c"
 	}
 #line 861 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp2_ = saved_search_table_get_instance ();
@@ -5808,7 +5809,7 @@ 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 5802 "SearchBoolean.c"
+#line 5803 "SearchBoolean.c"
 	}
 	{
 		SavedSearchDBTable* _tmp7_ = NULL;
@@ -5832,9 +5833,11 @@ 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"
+			gboolean _tmp12_ = FALSE;
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5828 "SearchBoolean.c"
+#line 5831 "SearchBoolean.c"
 				goto __catch78_database_error;
 			}
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5842,81 +5845,83 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_clear_error (&_inner_error_);
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			return FALSE;
-#line 5837 "SearchBoolean.c"
+			return _tmp12_;
+#line 5840 "SearchBoolean.c"
 		}
 	}
 	goto __finally78;
 	__catch78_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp12_ = NULL;
+		GError* _tmp13_ = NULL;
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		err = _inner_error_;
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_inner_error_ = NULL;
 #line 867 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp12_ = err;
+		_tmp13_ = err;
 #line 867 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		app_window_database_error (_tmp12_);
+		app_window_database_error (_tmp13_);
 #line 868 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		result = FALSE;
 #line 868 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_error_free0 (err);
 #line 868 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 5859 "SearchBoolean.c"
+#line 5862 "SearchBoolean.c"
 	}
 	__finally78:
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 5867 "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);
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		g_clear_error (&_inner_error_);
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		return FALSE;
-#line 5870 "SearchBoolean.c"
+		return _tmp14_;
+#line 5875 "SearchBoolean.c"
 	}
 #line 871 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp13_ = saved_search_table_get_instance ();
+	_tmp15_ = saved_search_table_get_instance ();
 #line 871 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp14_ = _tmp13_;
+	_tmp16_ = _tmp15_;
 #line 871 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	saved_search_table_remove_from_map (_tmp14_, self);
+	saved_search_table_remove_from_map (_tmp16_, self);
 #line 871 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_saved_search_table_unref0 (_tmp14_);
+	_saved_search_table_unref0 (_tmp16_);
 #line 872 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp15_ = self->priv->row;
+	_tmp17_ = self->priv->row;
 #line 872 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp16_ = new_name;
+	_tmp18_ = new_name;
 #line 872 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp17_ = g_strdup (_tmp16_);
+	_tmp19_ = g_strdup (_tmp18_);
 #line 872 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_g_free0 (_tmp15_->name);
+	_g_free0 (_tmp17_->name);
 #line 872 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp15_->name = _tmp17_;
+	_tmp17_->name = _tmp19_;
 #line 873 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp18_ = saved_search_table_get_instance ();
+	_tmp20_ = saved_search_table_get_instance ();
 #line 873 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp19_ = _tmp18_;
+	_tmp21_ = _tmp20_;
 #line 873 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	saved_search_table_add_to_map (_tmp19_, self);
+	saved_search_table_add_to_map (_tmp21_, self);
 #line 873 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_saved_search_table_unref0 (_tmp19_);
+	_saved_search_table_unref0 (_tmp21_);
 #line 875 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp20_ = library_window_get_app ();
+	_tmp22_ = library_window_get_app ();
 #line 875 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp21_ = _tmp20_;
+	_tmp23_ = _tmp22_;
 #line 875 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	library_window_switch_to_saved_search (_tmp21_, self);
+	library_window_switch_to_saved_search (_tmp23_, self);
 #line 875 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_g_object_unref0 (_tmp21_);
+	_g_object_unref0 (_tmp23_);
 #line 876 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	result = TRUE;
 #line 876 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5910 "SearchBoolean.c"
+#line 5915 "SearchBoolean.c"
 }
 
 
@@ -5940,7 +5945,7 @@ GeeList* saved_search_get_conditions (SavedSearch* self) {
 	result = _tmp3_;
 #line 880 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5934 "SearchBoolean.c"
+#line 5939 "SearchBoolean.c"
 }
 
 
@@ -5958,7 +5963,7 @@ SearchOperator saved_search_get_operator (SavedSearch* self) {
 	result = _tmp1_;
 #line 884 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5952 "SearchBoolean.c"
+#line 5957 "SearchBoolean.c"
 }
 
 
@@ -5968,23 +5973,23 @@ 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 = 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 = 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 = 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 = 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 5971 "SearchBoolean.c"
+#line 5976 "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 5978 "SearchBoolean.c"
+#line 5983 "SearchBoolean.c"
 }
 
 
@@ -5996,7 +6001,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 5990 "SearchBoolean.c"
+#line 5995 "SearchBoolean.c"
 }
 
 
@@ -6017,7 +6022,7 @@ 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 6011 "SearchBoolean.c"
+#line 6016 "SearchBoolean.c"
 	{
 		GeeList* _tmp0_ = NULL;
 		SavedSearchDBTable* _tmp1_ = NULL;
@@ -6040,7 +6045,7 @@ 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 6034 "SearchBoolean.c"
+#line 6039 "SearchBoolean.c"
 				goto __catch79_database_error;
 			}
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6049,7 +6054,7 @@ 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 6043 "SearchBoolean.c"
+#line 6048 "SearchBoolean.c"
 		}
 		{
 			GeeList* _row_list = NULL;
@@ -6077,7 +6082,7 @@ 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 6071 "SearchBoolean.c"
+#line 6076 "SearchBoolean.c"
 				gint _tmp9_ = 0;
 				gint _tmp10_ = 0;
 				gint _tmp11_ = 0;
@@ -6100,7 +6105,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 6094 "SearchBoolean.c"
+#line 6099 "SearchBoolean.c"
 				}
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp12_ = _row_list;
@@ -6122,15 +6127,15 @@ 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 6116 "SearchBoolean.c"
+#line 6121 "SearchBoolean.c"
 			}
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_object_unref0 (_row_list);
-#line 6120 "SearchBoolean.c"
+#line 6125 "SearchBoolean.c"
 		}
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_object_unref0 (_tmp0_);
-#line 6124 "SearchBoolean.c"
+#line 6129 "SearchBoolean.c"
 	}
 	goto __finally79;
 	__catch79_database_error:
@@ -6147,7 +6152,7 @@ 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 6141 "SearchBoolean.c"
+#line 6146 "SearchBoolean.c"
 	}
 	__finally79:
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6158,25 +6163,25 @@ 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 6152 "SearchBoolean.c"
+#line 6157 "SearchBoolean.c"
 	}
 #line 897 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self;
-#line 6156 "SearchBoolean.c"
+#line 6161 "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 6163 "SearchBoolean.c"
+#line 6168 "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 6170 "SearchBoolean.c"
+#line 6175 "SearchBoolean.c"
 }
 
 
@@ -6189,7 +6194,7 @@ SavedSearchTable* saved_search_table_get_instance (void) {
 	_tmp0_ = saved_search_table_instance;
 #line 909 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp0_ == NULL) {
-#line 6183 "SearchBoolean.c"
+#line 6188 "SearchBoolean.c"
 		SavedSearchTable* _tmp1_ = NULL;
 #line 910 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp1_ = saved_search_table_new ();
@@ -6197,7 +6202,7 @@ SavedSearchTable* saved_search_table_get_instance (void) {
 		_saved_search_table_unref0 (saved_search_table_instance);
 #line 910 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		saved_search_table_instance = _tmp1_;
-#line 6191 "SearchBoolean.c"
+#line 6196 "SearchBoolean.c"
 	}
 #line 912 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp2_ = saved_search_table_instance;
@@ -6207,7 +6212,7 @@ SavedSearchTable* saved_search_table_get_instance (void) {
 	result = _tmp3_;
 #line 912 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 6201 "SearchBoolean.c"
+#line 6206 "SearchBoolean.c"
 }
 
 
@@ -6221,14 +6226,14 @@ GeeCollection* saved_search_table_get_all (SavedSearchTable* self) {
 #line 916 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp0_ = self->priv->search_map;
 #line 916 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+	_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 916 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp2_ = _tmp1_;
 #line 916 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	result = _tmp2_;
 #line 916 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 6222 "SearchBoolean.c"
+#line 6227 "SearchBoolean.c"
 }
 
 
@@ -6248,7 +6253,7 @@ 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 6242 "SearchBoolean.c"
+#line 6247 "SearchBoolean.c"
 	{
 		SavedSearchRow* _tmp0_ = NULL;
 		SavedSearchDBTable* _tmp1_ = NULL;
@@ -6281,7 +6286,7 @@ 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 6275 "SearchBoolean.c"
+#line 6280 "SearchBoolean.c"
 				goto __catch80_database_error;
 			}
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6292,7 +6297,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 6286 "SearchBoolean.c"
+#line 6291 "SearchBoolean.c"
 		}
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp8_ = saved_search_new (_tmp0_, DATA_OBJECT_INVALID_OBJECT_ID);
@@ -6302,7 +6307,7 @@ 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 6296 "SearchBoolean.c"
+#line 6301 "SearchBoolean.c"
 	}
 	goto __finally80;
 	__catch80_database_error:
@@ -6319,7 +6324,7 @@ 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 6313 "SearchBoolean.c"
+#line 6318 "SearchBoolean.c"
 	}
 	__finally80:
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6332,7 +6337,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 6326 "SearchBoolean.c"
+#line 6331 "SearchBoolean.c"
 	}
 #line 932 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp10_ = search;
@@ -6352,7 +6357,7 @@ 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 6346 "SearchBoolean.c"
+#line 6351 "SearchBoolean.c"
 }
 
 
@@ -6363,7 +6368,7 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 	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 6357 "SearchBoolean.c"
+#line 6362 "SearchBoolean.c"
 	{
 		SavedSearchDBTable* _tmp0_ = NULL;
 		SavedSearchDBTable* _tmp1_ = NULL;
@@ -6385,7 +6390,7 @@ 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 6379 "SearchBoolean.c"
+#line 6384 "SearchBoolean.c"
 				goto __catch81_database_error;
 			}
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6394,7 +6399,7 @@ 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 6388 "SearchBoolean.c"
+#line 6393 "SearchBoolean.c"
 		}
 	}
 	goto __finally81;
@@ -6412,7 +6417,7 @@ 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 6406 "SearchBoolean.c"
+#line 6411 "SearchBoolean.c"
 	}
 	__finally81:
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6423,13 +6428,13 @@ 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 6417 "SearchBoolean.c"
+#line 6422 "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 6423 "SearchBoolean.c"
+#line 6428 "SearchBoolean.c"
 }
 
 
@@ -6462,7 +6467,7 @@ void saved_search_table_add_to_map (SavedSearchTable* self, SavedSearch* search)
 	_tmp5_ = search;
 #line 950 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_signal_emit_by_name (self, "search-added", _tmp5_);
-#line 6456 "SearchBoolean.c"
+#line 6461 "SearchBoolean.c"
 }
 
 
@@ -6492,7 +6497,7 @@ void saved_search_table_remove_from_map (SavedSearchTable* self, SavedSearch* se
 	_tmp4_ = search;
 #line 955 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_signal_emit_by_name (self, "search-removed", _tmp4_);
-#line 6486 "SearchBoolean.c"
+#line 6491 "SearchBoolean.c"
 }
 
 
@@ -6506,14 +6511,14 @@ GeeIterable* saved_search_table_get_saved_searches (SavedSearchTable* self) {
 #line 959 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp0_ = self->priv->search_map;
 #line 959 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+	_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 959 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp2_ = _tmp1_;
 #line 959 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable);
 #line 959 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 6507 "SearchBoolean.c"
+#line 6512 "SearchBoolean.c"
 }
 
 
@@ -6527,14 +6532,14 @@ gint saved_search_table_get_count (SavedSearchTable* self) {
 #line 963 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp0_ = self->priv->search_map;
 #line 963 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+	_tmp1_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 963 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp2_ = _tmp1_;
 #line 963 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	result = _tmp2_;
 #line 963 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 6528 "SearchBoolean.c"
+#line 6533 "SearchBoolean.c"
 }
 
 
@@ -6557,7 +6562,7 @@ 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 6551 "SearchBoolean.c"
+#line 6556 "SearchBoolean.c"
 }
 
 
@@ -6566,19 +6571,19 @@ gchar* saved_search_table_generate_unique_name (SavedSearchTable* self) {
 	gchar* _tmp7_ = NULL;
 #line 971 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_TABLE (self), NULL);
-#line 6560 "SearchBoolean.c"
+#line 6565 "SearchBoolean.c"
 	{
 		gint ctr = 0;
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		ctr = 1;
-#line 6565 "SearchBoolean.c"
+#line 6570 "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 6572 "SearchBoolean.c"
+#line 6577 "SearchBoolean.c"
 				gint _tmp2_ = 0;
 				gchar* name = NULL;
 				gint _tmp3_ = 0;
@@ -6587,13 +6592,13 @@ gchar* saved_search_table_generate_unique_name (SavedSearchTable* self) {
 				gboolean _tmp6_ = FALSE;
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				if (!_tmp0_) {
-#line 6581 "SearchBoolean.c"
+#line 6586 "SearchBoolean.c"
 					gint _tmp1_ = 0;
 #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 6587 "SearchBoolean.c"
+#line 6592 "SearchBoolean.c"
 				}
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp0_ = FALSE;
@@ -6603,7 +6608,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 6597 "SearchBoolean.c"
+#line 6602 "SearchBoolean.c"
 				}
 #line 973 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp3_ = ctr;
@@ -6621,11 +6626,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 6615 "SearchBoolean.c"
+#line 6620 "SearchBoolean.c"
 				}
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_g_free0 (name);
-#line 6619 "SearchBoolean.c"
+#line 6624 "SearchBoolean.c"
 			}
 		}
 	}
@@ -6635,14 +6640,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 6629 "SearchBoolean.c"
+#line 6634 "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 6636 "SearchBoolean.c"
+#line 6641 "SearchBoolean.c"
 }
 
 
@@ -6651,7 +6656,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 6645 "SearchBoolean.c"
+#line 6650 "SearchBoolean.c"
 	}
 }
 
@@ -6661,11 +6666,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 6655 "SearchBoolean.c"
+#line 6660 "SearchBoolean.c"
 	} else {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6659 "SearchBoolean.c"
+#line 6664 "SearchBoolean.c"
 	}
 }
 
@@ -6673,37 +6678,37 @@ 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 6667 "SearchBoolean.c"
+#line 6672 "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 6674 "SearchBoolean.c"
+#line 6679 "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 6681 "SearchBoolean.c"
+#line 6686 "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 6685 "SearchBoolean.c"
+#line 6690 "SearchBoolean.c"
 		}
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = saved_search_table_ref (object);
-#line 6689 "SearchBoolean.c"
+#line 6694 "SearchBoolean.c"
 	} else {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = NULL;
-#line 6693 "SearchBoolean.c"
+#line 6698 "SearchBoolean.c"
 	}
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return NULL;
-#line 6697 "SearchBoolean.c"
+#line 6702 "SearchBoolean.c"
 }
 
 
@@ -6714,25 +6719,25 @@ static gchar* value_saved_search_table_lcopy_value (const GValue* value, guint n
 	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 6708 "SearchBoolean.c"
+#line 6713 "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 6714 "SearchBoolean.c"
+#line 6719 "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 6718 "SearchBoolean.c"
+#line 6723 "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 6722 "SearchBoolean.c"
+#line 6727 "SearchBoolean.c"
 	}
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return NULL;
-#line 6726 "SearchBoolean.c"
+#line 6731 "SearchBoolean.c"
 }
 
 
@@ -6746,7 +6751,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 6740 "SearchBoolean.c"
+#line 6745 "SearchBoolean.c"
 }
 
 
@@ -6755,7 +6760,7 @@ 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 6749 "SearchBoolean.c"
+#line 6754 "SearchBoolean.c"
 }
 
 
@@ -6775,17 +6780,17 @@ 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 6769 "SearchBoolean.c"
+#line 6774 "SearchBoolean.c"
 	} else {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = NULL;
-#line 6773 "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 6779 "SearchBoolean.c"
+#line 6784 "SearchBoolean.c"
 	}
 }
 
@@ -6804,17 +6809,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 6798 "SearchBoolean.c"
+#line 6803 "SearchBoolean.c"
 	} else {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = NULL;
-#line 6802 "SearchBoolean.c"
+#line 6807 "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 6808 "SearchBoolean.c"
+#line 6813 "SearchBoolean.c"
 	}
 }
 
@@ -6830,7 +6835,7 @@ static void saved_search_table_class_init (SavedSearchTableClass * klass) {
 	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 6824 "SearchBoolean.c"
+#line 6829 "SearchBoolean.c"
 }
 
 
@@ -6839,12 +6844,12 @@ static void saved_search_table_instance_init (SavedSearchTable * self) {
 #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"
-	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_SAVED_SEARCH, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_SAVED_SEARCH, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 892 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv->search_map = _tmp0_;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->ref_count = 1;
-#line 6838 "SearchBoolean.c"
+#line 6843 "SearchBoolean.c"
 }
 
 
@@ -6856,7 +6861,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 6850 "SearchBoolean.c"
+#line 6855 "SearchBoolean.c"
 }
 
 
@@ -6881,7 +6886,7 @@ gpointer saved_search_table_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return instance;
-#line 6875 "SearchBoolean.c"
+#line 6880 "SearchBoolean.c"
 }
 
 
@@ -6894,7 +6899,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 6888 "SearchBoolean.c"
+#line 6893 "SearchBoolean.c"
 	}
 }
 
diff --git a/src/searches/Searches.c b/src/searches/Searches.c
index bb0f199..33bbc33 100644
--- a/src/searches/Searches.c
+++ b/src/searches/Searches.c
@@ -1,4 +1,4 @@
-/* Searches.c generated by valac 0.34.4, the Vala compiler
+/* Searches.c generated by valac 0.34.7, 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 798377f..26b9a21 100644
--- a/src/sidebar/Branch.c
+++ b/src/sidebar/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.4, the Vala compiler
+/* Branch.c generated by valac 0.34.7, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1116,7 +1116,7 @@ GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent)
 #line 1117 "Branch.c"
 	}
 #line 362 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = gee_array_list_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_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"
@@ -1854,7 +1854,7 @@ static void sidebar_branch_node_add_child (SidebarBranchNode* self, SidebarBranc
 #line 1855 "Branch.c"
 		GeeTreeSet* _tmp2_ = NULL;
 #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp2_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL);
+		_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"
@@ -1894,7 +1894,7 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr
 #line 75 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_vala_assert (_tmp0_ != NULL, "children != null");
 #line 77 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL);
+	_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);
 #line 77 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	new_children = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet);
 #line 81 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2270,7 +2270,7 @@ static gboolean sidebar_branch_node_reorder_child (SidebarBranchNode* self, Side
 #line 138 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_vala_assert (old_index >= 0, "old_index >= 0");
 #line 146 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL);
+	_tmp3_ = 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 146 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	new_children = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_SORTED_SET, GeeSortedSet);
 #line 147 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2327,7 +2327,7 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool
 #line 2328 "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, sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL);
+	_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);
 #line 162 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	reordered = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet);
 #line 163 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2778,7 +2778,7 @@ static void sidebar_branch_instance_init (SidebarBranch * self) {
 #line 190 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self->priv->shown = TRUE;
 #line 192 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = gee_hash_map_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, sidebar_branch_node_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_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"
diff --git a/src/sidebar/Entry.c b/src/sidebar/Entry.c
index 8edbd4c..1456a05 100644
--- a/src/sidebar/Entry.c
+++ b/src/sidebar/Entry.c
@@ -1,4 +1,4 @@
-/* Entry.c generated by valac 0.34.4, the Vala compiler
+/* Entry.c generated by valac 0.34.7, the Vala compiler
  * generated from Entry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/sidebar/Sidebar.c b/src/sidebar/Sidebar.c
index f7f7009..9bffe74 100644
--- a/src/sidebar/Sidebar.c
+++ b/src/sidebar/Sidebar.c
@@ -1,4 +1,4 @@
-/* Sidebar.c generated by valac 0.34.4, the Vala compiler
+/* Sidebar.c generated by valac 0.34.7, 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 f63fbe0..31d8b38 100644
--- a/src/sidebar/Tree.c
+++ b/src/sidebar/Tree.c
@@ -1,4 +1,4 @@
-/* Tree.c generated by valac 0.34.4, the Vala compiler
+/* Tree.c generated by valac 0.34.7, the Vala compiler
  * generated from Tree.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -3699,7 +3699,7 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 #line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (wrapper));
 #line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = gee_array_list_new (SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	children = _tmp0_;
 #line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -3778,7 +3778,7 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = _child_wrapper_list;
 #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp18_ = _tmp17_;
 #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7611,19 +7611,19 @@ 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
@@ -7662,11 +7662,11 @@ static void sidebar_tree_instance_init (SidebarTree * self) {
 #line 65 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->text_entry = NULL;
 #line 66 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = gee_hash_map_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp2_ = gee_hash_map_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 66 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->entry_map = _tmp2_;
 #line 68 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = gee_hash_map_new (SIDEBAR_TYPE_BRANCH, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_INT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp3_ = gee_hash_map_new (SIDEBAR_TYPE_BRANCH, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 68 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->branches = _tmp3_;
 #line 69 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
diff --git a/src/sidebar/common.c b/src/sidebar/common.c
index 582e3a9..4a8f7f4 100644
--- a/src/sidebar/common.c
+++ b/src/sidebar/common.c
@@ -1,4 +1,4 @@
-/* common.c generated by valac 0.34.4, the Vala compiler
+/* common.c generated by valac 0.34.7, the Vala compiler
  * generated from common.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 = 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 = 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 = 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 = 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"
diff --git a/src/slideshow/Slideshow.c b/src/slideshow/Slideshow.c
index 33dd9b1..4955bbd 100644
--- a/src/slideshow/Slideshow.c
+++ b/src/slideshow/Slideshow.c
@@ -1,4 +1,4 @@
-/* Slideshow.c generated by valac 0.34.4, the Vala compiler
+/* Slideshow.c generated by valac 0.34.7, the Vala compiler
  * generated from Slideshow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/slideshow/TransitionEffects.c b/src/slideshow/TransitionEffects.c
index f874db1..0e05963 100644
--- a/src/slideshow/TransitionEffects.c
+++ b/src/slideshow/TransitionEffects.c
@@ -1,4 +1,4 @@
-/* TransitionEffects.c generated by valac 0.34.4, the Vala compiler
+/* TransitionEffects.c generated by valac 0.34.7, the Vala compiler
  * generated from TransitionEffects.vala, do not modify */
 
 /* Copyright 2010 Maxim Kartashev
@@ -642,12 +642,16 @@ GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsMan
 #line 75 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp0__target_destroy_notify = comparator_target_destroy_notify;
 #line 75 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
+	comparator = NULL;
+#line 75 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
+	comparator_target = NULL;
+#line 75 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	comparator_target_destroy_notify = NULL;
 #line 75 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
-	_tmp1_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, _tmp0_, _tmp0__target, _tmp0__target_destroy_notify);
+	_tmp1_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, _tmp0_, _tmp0__target, _tmp0__target_destroy_notify);
 #line 75 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	effect_names = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 649 "TransitionEffects.c"
+#line 653 "TransitionEffects.c"
 	{
 		GeeIterator* _desc_it = NULL;
 		GeeMap* _tmp2_ = NULL;
@@ -674,7 +678,7 @@ GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsMan
 		_desc_it = _tmp7_;
 #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		while (TRUE) {
-#line 676 "TransitionEffects.c"
+#line 680 "TransitionEffects.c"
 			GeeIterator* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
 			SpitTransitionsDescriptor* desc = NULL;
@@ -691,7 +695,7 @@ GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsMan
 			if (!_tmp9_) {
 #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 				break;
-#line 693 "TransitionEffects.c"
+#line 697 "TransitionEffects.c"
 			}
 #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 			_tmp10_ = _desc_it;
@@ -709,11 +713,11 @@ GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsMan
 			gee_collection_add (_tmp12_, _tmp14_);
 #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 			_g_object_unref0 (desc);
-#line 711 "TransitionEffects.c"
+#line 715 "TransitionEffects.c"
 		}
 #line 76 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_g_object_unref0 (_desc_it);
-#line 715 "TransitionEffects.c"
+#line 719 "TransitionEffects.c"
 	}
 #line 79 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	result = effect_names;
@@ -727,7 +731,7 @@ GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsMan
 	comparator_target_destroy_notify = NULL;
 #line 79 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 729 "TransitionEffects.c"
+#line 733 "TransitionEffects.c"
 }
 
 
@@ -737,7 +741,7 @@ gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManag
 	g_return_val_if_fail (IS_TRANSITION_EFFECTS_MANAGER (self), NULL);
 #line 82 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	g_return_val_if_fail (effect_name != NULL, NULL);
-#line 739 "TransitionEffects.c"
+#line 743 "TransitionEffects.c"
 	{
 		GeeIterator* _desc_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -764,7 +768,7 @@ gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManag
 		_desc_it = _tmp5_;
 #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		while (TRUE) {
-#line 766 "TransitionEffects.c"
+#line 770 "TransitionEffects.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			SpitTransitionsDescriptor* desc = NULL;
@@ -781,7 +785,7 @@ gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManag
 			if (!_tmp7_) {
 #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 				break;
-#line 783 "TransitionEffects.c"
+#line 787 "TransitionEffects.c"
 			}
 #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 			_tmp8_ = _desc_it;
@@ -797,7 +801,7 @@ gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManag
 			_tmp12_ = effect_name;
 #line 84 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 			if (g_strcmp0 (_tmp11_, _tmp12_) == 0) {
-#line 799 "TransitionEffects.c"
+#line 803 "TransitionEffects.c"
 				SpitTransitionsDescriptor* _tmp13_ = NULL;
 				const gchar* _tmp14_ = NULL;
 				gchar* _tmp15_ = NULL;
@@ -815,21 +819,21 @@ gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManag
 				_g_object_unref0 (_desc_it);
 #line 85 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 				return result;
-#line 817 "TransitionEffects.c"
+#line 821 "TransitionEffects.c"
 			}
 #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 			_g_object_unref0 (desc);
-#line 821 "TransitionEffects.c"
+#line 825 "TransitionEffects.c"
 		}
 #line 83 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_g_object_unref0 (_desc_it);
-#line 825 "TransitionEffects.c"
+#line 829 "TransitionEffects.c"
 	}
 #line 88 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	result = NULL;
 #line 88 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 831 "TransitionEffects.c"
+#line 835 "TransitionEffects.c"
 }
 
 
@@ -852,7 +856,7 @@ SpitTransitionsDescriptor* transition_effects_manager_get_effect_descriptor (Tra
 	result = (SpitTransitionsDescriptor*) _tmp2_;
 #line 92 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 854 "TransitionEffects.c"
+#line 858 "TransitionEffects.c"
 }
 
 
@@ -878,7 +882,7 @@ gchar* transition_effects_manager_get_effect_name (TransitionEffectsManager* sel
 	_tmp3_ = desc;
 #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (_tmp3_ != NULL) {
-#line 880 "TransitionEffects.c"
+#line 884 "TransitionEffects.c"
 		SpitTransitionsDescriptor* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
 #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -887,14 +891,14 @@ gchar* transition_effects_manager_get_effect_name (TransitionEffectsManager* sel
 		_tmp5_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp2_ = _tmp5_;
-#line 889 "TransitionEffects.c"
+#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 896 "TransitionEffects.c"
+#line 900 "TransitionEffects.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp7_ = g_strdup (_tmp2_);
@@ -904,7 +908,7 @@ gchar* transition_effects_manager_get_effect_name (TransitionEffectsManager* sel
 	_g_object_unref0 (desc);
 #line 98 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 906 "TransitionEffects.c"
+#line 910 "TransitionEffects.c"
 }
 
 
@@ -922,7 +926,7 @@ SpitTransitionsDescriptor* transition_effects_manager_get_null_descriptor (Trans
 	result = _tmp1_;
 #line 102 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 924 "TransitionEffects.c"
+#line 928 "TransitionEffects.c"
 }
 
 
@@ -947,7 +951,7 @@ TransitionClock* transition_effects_manager_create_transition_clock (TransitionE
 	_tmp3_ = desc;
 #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (_tmp3_ != NULL) {
-#line 949 "TransitionEffects.c"
+#line 953 "TransitionEffects.c"
 		SpitTransitionsDescriptor* _tmp4_ = NULL;
 		TransitionClock* _tmp5_ = NULL;
 #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -958,13 +962,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 960 "TransitionEffects.c"
+#line 964 "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 966 "TransitionEffects.c"
+#line 970 "TransitionEffects.c"
 	}
 #line 108 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	result = _tmp2_;
@@ -972,7 +976,7 @@ 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 974 "TransitionEffects.c"
+#line 978 "TransitionEffects.c"
 }
 
 
@@ -990,14 +994,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 992 "TransitionEffects.c"
+#line 996 "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 999 "TransitionEffects.c"
+#line 1003 "TransitionEffects.c"
 }
 
 
@@ -1006,7 +1010,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 1008 "TransitionEffects.c"
+#line 1012 "TransitionEffects.c"
 	}
 }
 
@@ -1016,11 +1020,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 1018 "TransitionEffects.c"
+#line 1022 "TransitionEffects.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1022 "TransitionEffects.c"
+#line 1026 "TransitionEffects.c"
 	}
 }
 
@@ -1028,37 +1032,37 @@ 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 1030 "TransitionEffects.c"
+#line 1034 "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 1037 "TransitionEffects.c"
+#line 1041 "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 1044 "TransitionEffects.c"
+#line 1048 "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 1048 "TransitionEffects.c"
+#line 1052 "TransitionEffects.c"
 		}
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		value->data[0].v_pointer = transition_effects_manager_ref (object);
-#line 1052 "TransitionEffects.c"
+#line 1056 "TransitionEffects.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		value->data[0].v_pointer = NULL;
-#line 1056 "TransitionEffects.c"
+#line 1060 "TransitionEffects.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return NULL;
-#line 1060 "TransitionEffects.c"
+#line 1064 "TransitionEffects.c"
 }
 
 
@@ -1069,25 +1073,25 @@ static gchar* value_transition_effects_manager_lcopy_value (const GValue* value,
 	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 1071 "TransitionEffects.c"
+#line 1075 "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 1077 "TransitionEffects.c"
+#line 1081 "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 1081 "TransitionEffects.c"
+#line 1085 "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 1085 "TransitionEffects.c"
+#line 1089 "TransitionEffects.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return NULL;
-#line 1089 "TransitionEffects.c"
+#line 1093 "TransitionEffects.c"
 }
 
 
@@ -1101,7 +1105,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 1103 "TransitionEffects.c"
+#line 1107 "TransitionEffects.c"
 }
 
 
@@ -1110,7 +1114,7 @@ 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 1112 "TransitionEffects.c"
+#line 1116 "TransitionEffects.c"
 }
 
 
@@ -1130,17 +1134,17 @@ 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 1132 "TransitionEffects.c"
+#line 1136 "TransitionEffects.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		value->data[0].v_pointer = NULL;
-#line 1136 "TransitionEffects.c"
+#line 1140 "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 1142 "TransitionEffects.c"
+#line 1146 "TransitionEffects.c"
 	}
 }
 
@@ -1159,17 +1163,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 1161 "TransitionEffects.c"
+#line 1165 "TransitionEffects.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		value->data[0].v_pointer = NULL;
-#line 1165 "TransitionEffects.c"
+#line 1169 "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 1171 "TransitionEffects.c"
+#line 1175 "TransitionEffects.c"
 	}
 }
 
@@ -1181,7 +1185,7 @@ 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 1183 "TransitionEffects.c"
+#line 1187 "TransitionEffects.c"
 }
 
 
@@ -1192,7 +1196,7 @@ static void transition_effects_manager_instance_init (TransitionEffectsManager *
 #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"
-	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, SPIT_TRANSITIONS_TYPE_DESCRIPTOR, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, SPIT_TRANSITIONS_TYPE_DESCRIPTOR, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 14 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	self->priv->effects = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap);
 #line 16 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
@@ -1205,7 +1209,7 @@ 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 1207 "TransitionEffects.c"
+#line 1211 "TransitionEffects.c"
 }
 
 
@@ -1234,7 +1238,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 1236 "TransitionEffects.c"
+#line 1240 "TransitionEffects.c"
 }
 
 
@@ -1259,7 +1263,7 @@ gpointer transition_effects_manager_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 8 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return instance;
-#line 1261 "TransitionEffects.c"
+#line 1265 "TransitionEffects.c"
 }
 
 
@@ -1272,7 +1276,7 @@ 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 1274 "TransitionEffects.c"
+#line 1278 "TransitionEffects.c"
 	}
 }
 
@@ -1340,14 +1344,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 1342 "TransitionEffects.c"
+#line 1346 "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 1349 "TransitionEffects.c"
+#line 1353 "TransitionEffects.c"
 }
 
 
@@ -1362,21 +1366,21 @@ gboolean transition_clock_is_in_progress (TransitionClock* self) {
 	_tmp2_ = self->priv->cancelled;
 #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (!_tmp2_) {
-#line 1364 "TransitionEffects.c"
+#line 1368 "TransitionEffects.c"
 		SpitTransitionsMotion* _tmp3_ = NULL;
 #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 1370 "TransitionEffects.c"
+#line 1374 "TransitionEffects.c"
 	} else {
 #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp1_ = FALSE;
-#line 1374 "TransitionEffects.c"
+#line 1378 "TransitionEffects.c"
 	}
 #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (_tmp1_) {
-#line 1378 "TransitionEffects.c"
+#line 1382 "TransitionEffects.c"
 		gint _tmp4_ = 0;
 		SpitTransitionsMotion* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
@@ -1391,17 +1395,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 1393 "TransitionEffects.c"
+#line 1397 "TransitionEffects.c"
 	} else {
 #line 152 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp0_ = FALSE;
-#line 1397 "TransitionEffects.c"
+#line 1401 "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 1403 "TransitionEffects.c"
+#line 1407 "TransitionEffects.c"
 }
 
 
@@ -1410,7 +1414,7 @@ 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 1412 "TransitionEffects.c"
+#line 1416 "TransitionEffects.c"
 }
 
 
@@ -1444,7 +1448,7 @@ void transition_clock_start (TransitionClock* self, SpitTransitionsVisuals* visu
 	if (_tmp0_ == 0) {
 #line 161 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		return;
-#line 1446 "TransitionEffects.c"
+#line 1450 "TransitionEffects.c"
 	}
 #line 163 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp1_ = visuals;
@@ -1496,7 +1500,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 1498 "TransitionEffects.c"
+#line 1502 "TransitionEffects.c"
 }
 
 
@@ -1525,7 +1529,7 @@ 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 1527 "TransitionEffects.c"
+#line 1531 "TransitionEffects.c"
 }
 
 
@@ -1537,7 +1541,7 @@ static void transition_clock_cancel_timer (TransitionClock* self) {
 	_tmp0_ = self->priv->timer_id;
 #line 189 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (_tmp0_ != ((guint) 0)) {
-#line 1539 "TransitionEffects.c"
+#line 1543 "TransitionEffects.c"
 		guint _tmp1_ = 0U;
 #line 190 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp1_ = self->priv->timer_id;
@@ -1545,7 +1549,7 @@ static void transition_clock_cancel_timer (TransitionClock* self) {
 		g_source_remove (_tmp1_);
 #line 191 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		self->priv->timer_id = (guint) 0;
-#line 1547 "TransitionEffects.c"
+#line 1551 "TransitionEffects.c"
 	}
 }
 
@@ -1578,7 +1582,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 1580 "TransitionEffects.c"
+#line 1584 "TransitionEffects.c"
 	}
 #line 202 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp2_ = now_ms ();
@@ -1594,7 +1598,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 1596 "TransitionEffects.c"
+#line 1600 "TransitionEffects.c"
 	}
 #line 206 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp5_ = self->priv->frame_number;
@@ -1608,7 +1612,7 @@ 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 1610 "TransitionEffects.c"
+#line 1614 "TransitionEffects.c"
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
 		gdouble _tmp11_ = 0.0;
@@ -1624,7 +1628,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 1625 "TransitionEffects.c"
+#line 1629 "TransitionEffects.c"
 	}
 #line 212 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp13_ = self->priv->current_fps;
@@ -1634,7 +1638,7 @@ 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 1635 "TransitionEffects.c"
+#line 1639 "TransitionEffects.c"
 }
 
 
@@ -1658,7 +1662,7 @@ 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 1659 "TransitionEffects.c"
+#line 1663 "TransitionEffects.c"
 }
 
 
@@ -1690,7 +1694,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 1691 "TransitionEffects.c"
+#line 1695 "TransitionEffects.c"
 	}
 #line 231 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp1_ = self->priv->paint_timer;
@@ -1706,7 +1710,7 @@ 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 1707 "TransitionEffects.c"
+#line 1711 "TransitionEffects.c"
 		cairo_t* _tmp5_ = NULL;
 		SpitTransitionsVisuals* _tmp6_ = NULL;
 		GdkRGBA _tmp7_ = {0};
@@ -1776,7 +1780,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 1777 "TransitionEffects.c"
+#line 1781 "TransitionEffects.c"
 	}
 #line 242 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp26_ = self->priv->effect;
@@ -1806,7 +1810,7 @@ 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 1807 "TransitionEffects.c"
+#line 1811 "TransitionEffects.c"
 }
 
 
@@ -1830,7 +1834,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 1831 "TransitionEffects.c"
+#line 1835 "TransitionEffects.c"
 	}
 #line 259 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp1_ = self->priv->repaint;
@@ -1848,7 +1852,7 @@ static gboolean transition_clock_tick (TransitionClock* self) {
 		result = FALSE;
 #line 264 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		return result;
-#line 1849 "TransitionEffects.c"
+#line 1853 "TransitionEffects.c"
 	}
 #line 268 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp3_ = self->priv->frame_number;
@@ -1860,7 +1864,7 @@ static gboolean transition_clock_tick (TransitionClock* self) {
 	_tmp6_ = _tmp5_;
 #line 268 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	if (_tmp3_ < _tmp6_) {
-#line 1861 "TransitionEffects.c"
+#line 1865 "TransitionEffects.c"
 		SpitTransitionsEffect* _tmp7_ = NULL;
 		SpitTransitionsVisuals* _tmp8_ = NULL;
 		SpitTransitionsMotion* _tmp9_ = NULL;
@@ -1880,20 +1884,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 1881 "TransitionEffects.c"
+#line 1885 "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 1887 "TransitionEffects.c"
+#line 1891 "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 1894 "TransitionEffects.c"
+#line 1898 "TransitionEffects.c"
 }
 
 
@@ -1902,7 +1906,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 1903 "TransitionEffects.c"
+#line 1907 "TransitionEffects.c"
 	}
 }
 
@@ -1912,11 +1916,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 1913 "TransitionEffects.c"
+#line 1917 "TransitionEffects.c"
 	} else {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1917 "TransitionEffects.c"
+#line 1921 "TransitionEffects.c"
 	}
 }
 
@@ -1924,37 +1928,37 @@ 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 1925 "TransitionEffects.c"
+#line 1929 "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 1932 "TransitionEffects.c"
+#line 1936 "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 1939 "TransitionEffects.c"
+#line 1943 "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 1943 "TransitionEffects.c"
+#line 1947 "TransitionEffects.c"
 		}
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		value->data[0].v_pointer = transition_clock_ref (object);
-#line 1947 "TransitionEffects.c"
+#line 1951 "TransitionEffects.c"
 	} else {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		value->data[0].v_pointer = NULL;
-#line 1951 "TransitionEffects.c"
+#line 1955 "TransitionEffects.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return NULL;
-#line 1955 "TransitionEffects.c"
+#line 1959 "TransitionEffects.c"
 }
 
 
@@ -1965,25 +1969,25 @@ static gchar* value_transition_clock_lcopy_value (const GValue* value, guint n_c
 	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 1966 "TransitionEffects.c"
+#line 1970 "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 1972 "TransitionEffects.c"
+#line 1976 "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 1976 "TransitionEffects.c"
+#line 1980 "TransitionEffects.c"
 	} else {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		*object_p = transition_clock_ref (value->data[0].v_pointer);
-#line 1980 "TransitionEffects.c"
+#line 1984 "TransitionEffects.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return NULL;
-#line 1984 "TransitionEffects.c"
+#line 1988 "TransitionEffects.c"
 }
 
 
@@ -1997,7 +2001,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 1998 "TransitionEffects.c"
+#line 2002 "TransitionEffects.c"
 }
 
 
@@ -2006,7 +2010,7 @@ 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 2007 "TransitionEffects.c"
+#line 2011 "TransitionEffects.c"
 }
 
 
@@ -2026,17 +2030,17 @@ 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 2027 "TransitionEffects.c"
+#line 2031 "TransitionEffects.c"
 	} else {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		value->data[0].v_pointer = NULL;
-#line 2031 "TransitionEffects.c"
+#line 2035 "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 2037 "TransitionEffects.c"
+#line 2041 "TransitionEffects.c"
 	}
 }
 
@@ -2055,17 +2059,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 2056 "TransitionEffects.c"
+#line 2060 "TransitionEffects.c"
 	} else {
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		value->data[0].v_pointer = NULL;
-#line 2060 "TransitionEffects.c"
+#line 2064 "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 2066 "TransitionEffects.c"
+#line 2070 "TransitionEffects.c"
 	}
 }
 
@@ -2077,7 +2081,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 2078 "TransitionEffects.c"
+#line 2082 "TransitionEffects.c"
 }
 
 
@@ -2102,7 +2106,7 @@ 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 2103 "TransitionEffects.c"
+#line 2107 "TransitionEffects.c"
 }
 
 
@@ -2126,7 +2130,7 @@ 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 2127 "TransitionEffects.c"
+#line 2131 "TransitionEffects.c"
 		SpitTransitionsMotion* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
@@ -2138,11 +2142,11 @@ static void transition_clock_finalize (TransitionClock* obj) {
 		_tmp4_ = _tmp3_;
 #line 148 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp0_ = _tmp4_;
-#line 2139 "TransitionEffects.c"
+#line 2143 "TransitionEffects.c"
 	} else {
 #line 148 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 		_tmp0_ = 0;
-#line 2143 "TransitionEffects.c"
+#line 2147 "TransitionEffects.c"
 	}
 #line 147 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	_tmp5_ = self->priv->paint_timer;
@@ -2171,7 +2175,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 2171 "TransitionEffects.c"
+#line 2175 "TransitionEffects.c"
 }
 
 
@@ -2196,7 +2200,7 @@ gpointer transition_clock_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 116 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return instance;
-#line 2196 "TransitionEffects.c"
+#line 2200 "TransitionEffects.c"
 }
 
 
@@ -2209,7 +2213,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 2209 "TransitionEffects.c"
+#line 2213 "TransitionEffects.c"
 	}
 }
 
@@ -2223,7 +2227,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 2223 "TransitionEffects.c"
+#line 2227 "TransitionEffects.c"
 }
 
 
@@ -2236,7 +2240,7 @@ 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 2236 "TransitionEffects.c"
+#line 2240 "TransitionEffects.c"
 }
 
 
@@ -2252,7 +2256,7 @@ static const gchar* null_transition_descriptor_real_get_pluggable_name (SpitPlug
 	result = _tmp0_;
 #line 287 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 2252 "TransitionEffects.c"
+#line 2256 "TransitionEffects.c"
 }
 
 
@@ -2262,7 +2266,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 2262 "TransitionEffects.c"
+#line 2266 "TransitionEffects.c"
 }
 
 
@@ -2270,7 +2274,7 @@ 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 2270 "TransitionEffects.c"
+#line 2274 "TransitionEffects.c"
 }
 
 
@@ -2288,7 +2292,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 2288 "TransitionEffects.c"
+#line 2292 "TransitionEffects.c"
 }
 
 
@@ -2298,21 +2302,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 2298 "TransitionEffects.c"
+#line 2302 "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 2305 "TransitionEffects.c"
+#line 2309 "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 2312 "TransitionEffects.c"
+#line 2316 "TransitionEffects.c"
 }
 
 
@@ -2329,7 +2333,7 @@ static void null_transition_descriptor_spit_pluggable_interface_init (SpitPlugga
 	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 2329 "TransitionEffects.c"
+#line 2333 "TransitionEffects.c"
 }
 
 
@@ -2338,7 +2342,7 @@ static void null_transition_descriptor_spit_transitions_descriptor_interface_ini
 	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 2338 "TransitionEffects.c"
+#line 2342 "TransitionEffects.c"
 }
 
 
@@ -2368,14 +2372,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 2368 "TransitionEffects.c"
+#line 2372 "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 2375 "TransitionEffects.c"
+#line 2379 "TransitionEffects.c"
 }
 
 
@@ -2393,13 +2397,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 2393 "TransitionEffects.c"
+#line 2397 "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 2399 "TransitionEffects.c"
+#line 2403 "TransitionEffects.c"
 	}
 }
 
@@ -2412,7 +2416,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 2412 "TransitionEffects.c"
+#line 2416 "TransitionEffects.c"
 }
 
 
@@ -2425,7 +2429,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 2425 "TransitionEffects.c"
+#line 2429 "TransitionEffects.c"
 }
 
 
@@ -2439,7 +2443,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 2439 "TransitionEffects.c"
+#line 2443 "TransitionEffects.c"
 }
 
 
@@ -2451,7 +2455,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 2451 "TransitionEffects.c"
+#line 2455 "TransitionEffects.c"
 }
 
 
@@ -2459,14 +2463,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 2459 "TransitionEffects.c"
+#line 2463 "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 2466 "TransitionEffects.c"
+#line 2470 "TransitionEffects.c"
 }
 
 
@@ -2485,7 +2489,7 @@ static void null_effect_spit_transitions_effect_interface_init (SpitTransitionsE
 	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 2485 "TransitionEffects.c"
+#line 2489 "TransitionEffects.c"
 }
 
 
@@ -2516,7 +2520,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 2516 "TransitionEffects.c"
+#line 2520 "TransitionEffects.c"
 }
 
 
@@ -2529,7 +2533,7 @@ 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 2529 "TransitionEffects.c"
+#line 2533 "TransitionEffects.c"
 }
 
 
@@ -2545,7 +2549,7 @@ static const gchar* random_effect_descriptor_real_get_pluggable_name (SpitPlugga
 	result = _tmp0_;
 #line 339 "/home/jens/Source/shotwell/src/slideshow/TransitionEffects.vala"
 	return result;
-#line 2545 "TransitionEffects.c"
+#line 2549 "TransitionEffects.c"
 }
 
 
@@ -2555,7 +2559,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 2555 "TransitionEffects.c"
+#line 2559 "TransitionEffects.c"
 }
 
 
@@ -2563,7 +2567,7 @@ 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 2563 "TransitionEffects.c"
+#line 2567 "TransitionEffects.c"
 }
 
 
@@ -2581,7 +2585,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 2581 "TransitionEffects.c"
+#line 2585 "TransitionEffects.c"
 }
 
 
@@ -2591,21 +2595,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 2591 "TransitionEffects.c"
+#line 2595 "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 2598 "TransitionEffects.c"
+#line 2602 "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 2605 "TransitionEffects.c"
+#line 2609 "TransitionEffects.c"
 }
 
 
@@ -2622,7 +2626,7 @@ static void random_effect_descriptor_spit_pluggable_interface_init (SpitPluggabl
 	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 2622 "TransitionEffects.c"
+#line 2626 "TransitionEffects.c"
 }
 
 
@@ -2631,7 +2635,7 @@ static void random_effect_descriptor_spit_transitions_descriptor_interface_init
 	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 2631 "TransitionEffects.c"
+#line 2635 "TransitionEffects.c"
 }
 
 
diff --git a/src/tags/Branch.c b/src/tags/Branch.c
index 7c51fba..9bad2d8 100644
--- a/src/tags/Branch.c
+++ b/src/tags/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.4, the Vala compiler
+/* Branch.c generated by valac 0.34.7, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1022,7 +1022,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 		GeeSortedSet* added = NULL;
 		GeeTreeSet* _tmp1_ = NULL;
 #line 57 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp1_ = gee_tree_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tag_compare_names_gcompare_data_func, NULL, NULL);
+		_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"
 		added = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet);
 #line 1029 "Branch.c"
@@ -1573,7 +1573,7 @@ static void tags_branch_instance_init (TagsBranch * self) {
 #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"
-	_tmp0_ = gee_hash_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, TAGS_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TAGS_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 8 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv->entry_map = _tmp0_;
 #line 1580 "Branch.c"
@@ -2929,11 +2929,11 @@ 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 = 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 = 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 = 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"
diff --git a/src/tags/HierarchicalTagIndex.c b/src/tags/HierarchicalTagIndex.c
index 0a163d3..82dfdda 100644
--- a/src/tags/HierarchicalTagIndex.c
+++ b/src/tags/HierarchicalTagIndex.c
@@ -1,4 +1,4 @@
-/* HierarchicalTagIndex.c generated by valac 0.34.4, the Vala compiler
+/* HierarchicalTagIndex.c generated by valac 0.34.7, the Vala compiler
  * generated from HierarchicalTagIndex.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -153,13 +153,13 @@ HierarchicalTagIndex* hierarchical_tag_index_construct (GType object_type) {
 #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"
-	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GEE_TYPE_ARRAY_LIST, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_ARRAY_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 12 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	_g_object_unref0 (self->priv->tag_table);
 #line 12 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	self->priv->tag_table = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap);
 #line 13 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
-	_tmp1_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+	_tmp1_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 13 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	_g_object_unref0 (self->priv->known_paths);
 #line 13 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -403,7 +403,7 @@ void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, const gchar* t
 #line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 		_tmp4_ = tag;
 #line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
-		_tmp5_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+		_tmp5_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 		_tmp6_ = _tmp5_;
 #line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
diff --git a/src/tags/HierarchicalTagUtilities.c b/src/tags/HierarchicalTagUtilities.c
index 1945def..f213e17 100644
--- a/src/tags/HierarchicalTagUtilities.c
+++ b/src/tags/HierarchicalTagUtilities.c
@@ -1,4 +1,4 @@
-/* HierarchicalTagUtilities.c generated by valac 0.34.4, the Vala compiler
+/* HierarchicalTagUtilities.c generated by valac 0.34.7, the Vala compiler
  * generated from HierarchicalTagUtilities.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -506,7 +506,7 @@ GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path
 #line 44 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	path = _tmp1_;
 #line 46 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
-	_tmp2_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+	_tmp2_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 46 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	_result_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList);
 #line 48 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -664,7 +664,7 @@ GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_p
 #line 65 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	path = _tmp1_;
 #line 67 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
-	_tmp2_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+	_tmp2_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 67 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	components = _tmp2_;
 #line 69 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -727,7 +727,7 @@ GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_p
 #line 76 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	_tmp11_ = components;
 #line 76 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
-	_tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 76 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
 	_tmp13_ = _tmp12_;
 #line 76 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
diff --git a/src/tags/TagPage.c b/src/tags/TagPage.c
index 9c8acc0..6e347f7 100644
--- a/src/tags/TagPage.c
+++ b/src/tags/TagPage.c
@@ -1,4 +1,4 @@
-/* TagPage.c generated by valac 0.34.4, the Vala compiler
+/* TagPage.c generated by valac 0.34.7, the Vala compiler
  * generated from TagPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 = 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 = 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 = 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 = 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 = 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 = 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"
diff --git a/src/tags/Tags.c b/src/tags/Tags.c
index 3cc2f18..d2d0690 100644
--- a/src/tags/Tags.c
+++ b/src/tags/Tags.c
@@ -1,4 +1,4 @@
-/* Tags.c generated by valac 0.34.4, the Vala compiler
+/* Tags.c generated by valac 0.34.7, 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 ec7c78f..cfb54d3 100644
--- a/src/threads/BackgroundJob.c
+++ b/src/threads/BackgroundJob.c
@@ -1,4 +1,4 @@
-/* BackgroundJob.c generated by valac 0.34.4, the Vala compiler
+/* BackgroundJob.c generated by valac 0.34.7, the Vala compiler
  * generated from BackgroundJob.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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* _tmp7_ = NULL;
 	BackgroundJobNotificationJob* _tmp8_ = NULL;
-	NotificationCallback _tmp9_ = NULL;
-	void* _tmp9__target = NULL;
-	BackgroundJobNotificationJob* _tmp10_ = NULL;
-	BackgroundJob* _tmp11_ = NULL;
-	BackgroundJobNotificationJob* _tmp12_ = NULL;
-	NotificationObject* _tmp13_ = NULL;
+	BackgroundJobNotificationJob* _tmp9_ = NULL;
+	NotificationCallback _tmp10_ = NULL;
+	void* _tmp10__target = NULL;
+	BackgroundJobNotificationJob* _tmp11_ = NULL;
+	BackgroundJob* _tmp12_ = NULL;
+	BackgroundJobNotificationJob* _tmp13_ = NULL;
+	NotificationObject* _tmp14_ = NULL;
 	InterlockedNotificationObject* interlocked = NULL;
-	BackgroundJobNotificationJob* _tmp14_ = NULL;
-	NotificationObject* _tmp15_ = NULL;
-	InterlockedNotificationObject* _tmp16_ = NULL;
+	BackgroundJobNotificationJob* _tmp15_ = NULL;
+	NotificationObject* _tmp16_ = NULL;
 	InterlockedNotificationObject* _tmp17_ = NULL;
+	InterlockedNotificationObject* _tmp18_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 223 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	g_return_val_if_fail (IS_BACKGROUND_JOB (self), FALSE);
@@ -1239,7 +1239,7 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) {
 #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"
-			_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 228 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 			_tmp3_ = _tmp2_;
 #line 228 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1269,6 +1269,8 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) {
 		}
 #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1273 "BackgroundJob.c"
+			gboolean _tmp7_ = FALSE;
 #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 			_background_job_notification_job_unref0 (notification_job);
 #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
@@ -1276,49 +1278,49 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) {
 #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 			g_clear_error (&_inner_error_);
 #line 227 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-			return FALSE;
-#line 1281 "BackgroundJob.c"
+			return _tmp7_;
+#line 1283 "BackgroundJob.c"
 		}
 	}
 #line 231 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-	_tmp7_ = notification_job;
+	_tmp8_ = notification_job;
 #line 231 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-	_vala_assert (_tmp7_ != NULL, "notification_job != null");
+	_vala_assert (_tmp8_ != NULL, "notification_job != null");
 #line 233 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-	_tmp8_ = notification_job;
+	_tmp9_ = notification_job;
 #line 233 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-	_tmp9_ = _tmp8_->callback;
+	_tmp10_ = _tmp9_->callback;
 #line 233 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-	_tmp9__target = _tmp8_->callback_target;
+	_tmp10__target = _tmp9_->callback_target;
 #line 233 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-	_tmp10_ = notification_job;
+	_tmp11_ = notification_job;
 #line 233 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-	_tmp11_ = _tmp10_->background_job;
+	_tmp12_ = _tmp11_->background_job;
 #line 233 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-	_tmp12_ = notification_job;
+	_tmp13_ = notification_job;
 #line 233 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-	_tmp13_ = _tmp12_->user;
+	_tmp14_ = _tmp13_->user;
 #line 233 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-	_tmp9_ (_tmp11_, _tmp13_, _tmp9__target);
+	_tmp10_ (_tmp12_, _tmp14_, _tmp10__target);
 #line 236 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-	_tmp14_ = notification_job;
+	_tmp15_ = notification_job;
 #line 236 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-	_tmp15_ = _tmp14_->user;
+	_tmp16_ = _tmp15_->user;
 #line 236 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-	_tmp16_ = _notification_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_INTERLOCKED_NOTIFICATION_OBJECT) ? ((InterlockedNotificationObject*) _tmp15_) : NULL);
+	_tmp17_ = _notification_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_INTERLOCKED_NOTIFICATION_OBJECT) ? ((InterlockedNotificationObject*) _tmp16_) : NULL);
 #line 236 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-	interlocked = _tmp16_;
+	interlocked = _tmp17_;
 #line 237 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-	_tmp17_ = interlocked;
+	_tmp18_ = interlocked;
 #line 237 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-	if (_tmp17_ != NULL) {
-#line 1316 "BackgroundJob.c"
-		InterlockedNotificationObject* _tmp18_ = NULL;
+	if (_tmp18_ != NULL) {
+#line 1318 "BackgroundJob.c"
+		InterlockedNotificationObject* _tmp19_ = NULL;
 #line 238 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-		_tmp18_ = interlocked;
+		_tmp19_ = interlocked;
 #line 238 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
-		interlocked_notification_object_internal_completed (_tmp18_);
-#line 1322 "BackgroundJob.c"
+		interlocked_notification_object_internal_completed (_tmp19_);
+#line 1324 "BackgroundJob.c"
 	}
 #line 240 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	result = FALSE;
@@ -1328,7 +1330,7 @@ static gboolean background_job_on_notification_ready (BackgroundJob* self) {
 	_background_job_notification_job_unref0 (notification_job);
 #line 240 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	return result;
-#line 1332 "BackgroundJob.c"
+#line 1334 "BackgroundJob.c"
 }
 
 
@@ -1372,21 +1374,21 @@ static BackgroundJobNotificationJob* background_job_notification_job_construct (
 	self->user = _tmp4_;
 #line 88 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	return self;
-#line 1376 "BackgroundJob.c"
+#line 1378 "BackgroundJob.c"
 }
 
 
 static BackgroundJobNotificationJob* background_job_notification_job_new (NotificationCallback callback, void* callback_target, BackgroundJob* background_job, NotificationObject* user) {
 #line 88 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	return background_job_notification_job_construct (BACKGROUND_JOB_TYPE_NOTIFICATION_JOB, callback, callback_target, background_job, user);
-#line 1383 "BackgroundJob.c"
+#line 1385 "BackgroundJob.c"
 }
 
 
 static void background_job_value_notification_job_init (GValue* value) {
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	value->data[0].v_pointer = NULL;
-#line 1390 "BackgroundJob.c"
+#line 1392 "BackgroundJob.c"
 }
 
 
@@ -1395,7 +1397,7 @@ static void background_job_value_notification_job_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		background_job_notification_job_unref (value->data[0].v_pointer);
-#line 1399 "BackgroundJob.c"
+#line 1401 "BackgroundJob.c"
 	}
 }
 
@@ -1405,11 +1407,11 @@ static void background_job_value_notification_job_copy_value (const GValue* src_
 	if (src_value->data[0].v_pointer) {
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		dest_value->data[0].v_pointer = background_job_notification_job_ref (src_value->data[0].v_pointer);
-#line 1409 "BackgroundJob.c"
+#line 1411 "BackgroundJob.c"
 	} else {
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1413 "BackgroundJob.c"
+#line 1415 "BackgroundJob.c"
 	}
 }
 
@@ -1417,37 +1419,37 @@ static void background_job_value_notification_job_copy_value (const GValue* src_
 static gpointer background_job_value_notification_job_peek_pointer (const GValue* value) {
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	return value->data[0].v_pointer;
-#line 1421 "BackgroundJob.c"
+#line 1423 "BackgroundJob.c"
 }
 
 
 static gchar* background_job_value_notification_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (collect_values[0].v_pointer) {
-#line 1428 "BackgroundJob.c"
+#line 1430 "BackgroundJob.c"
 		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) {
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1435 "BackgroundJob.c"
+#line 1437 "BackgroundJob.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.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 1439 "BackgroundJob.c"
+#line 1441 "BackgroundJob.c"
 		}
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		value->data[0].v_pointer = background_job_notification_job_ref (object);
-#line 1443 "BackgroundJob.c"
+#line 1445 "BackgroundJob.c"
 	} else {
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		value->data[0].v_pointer = NULL;
-#line 1447 "BackgroundJob.c"
+#line 1449 "BackgroundJob.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	return NULL;
-#line 1451 "BackgroundJob.c"
+#line 1453 "BackgroundJob.c"
 }
 
 
@@ -1458,25 +1460,25 @@ static gchar* background_job_value_notification_job_lcopy_value (const GValue* v
 	if (!object_p) {
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1462 "BackgroundJob.c"
+#line 1464 "BackgroundJob.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (!value->data[0].v_pointer) {
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		*object_p = NULL;
-#line 1468 "BackgroundJob.c"
+#line 1470 "BackgroundJob.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1472 "BackgroundJob.c"
+#line 1474 "BackgroundJob.c"
 	} else {
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		*object_p = background_job_notification_job_ref (value->data[0].v_pointer);
-#line 1476 "BackgroundJob.c"
+#line 1478 "BackgroundJob.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	return NULL;
-#line 1480 "BackgroundJob.c"
+#line 1482 "BackgroundJob.c"
 }
 
 
@@ -1490,7 +1492,7 @@ static GParamSpec* background_job_param_spec_notification_job (const gchar* name
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	return G_PARAM_SPEC (spec);
-#line 1494 "BackgroundJob.c"
+#line 1496 "BackgroundJob.c"
 }
 
 
@@ -1499,7 +1501,7 @@ static gpointer background_job_value_get_notification_job (const GValue* value)
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, BACKGROUND_JOB_TYPE_NOTIFICATION_JOB), NULL);
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	return value->data[0].v_pointer;
-#line 1503 "BackgroundJob.c"
+#line 1505 "BackgroundJob.c"
 }
 
 
@@ -1519,17 +1521,17 @@ static void background_job_value_set_notification_job (GValue* value, gpointer v
 		value->data[0].v_pointer = v_object;
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		background_job_notification_job_ref (value->data[0].v_pointer);
-#line 1523 "BackgroundJob.c"
+#line 1525 "BackgroundJob.c"
 	} else {
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		value->data[0].v_pointer = NULL;
-#line 1527 "BackgroundJob.c"
+#line 1529 "BackgroundJob.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (old) {
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		background_job_notification_job_unref (old);
-#line 1533 "BackgroundJob.c"
+#line 1535 "BackgroundJob.c"
 	}
 }
 
@@ -1548,17 +1550,17 @@ static void background_job_value_take_notification_job (GValue* value, gpointer
 		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/threads/BackgroundJob.vala"
 		value->data[0].v_pointer = v_object;
-#line 1552 "BackgroundJob.c"
+#line 1554 "BackgroundJob.c"
 	} else {
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		value->data[0].v_pointer = NULL;
-#line 1556 "BackgroundJob.c"
+#line 1558 "BackgroundJob.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (old) {
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		background_job_notification_job_unref (old);
-#line 1562 "BackgroundJob.c"
+#line 1564 "BackgroundJob.c"
 	}
 }
 
@@ -1568,14 +1570,14 @@ static void background_job_notification_job_class_init (BackgroundJobNotificatio
 	background_job_notification_job_parent_class = g_type_class_peek_parent (klass);
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	((BackgroundJobNotificationJobClass *) klass)->finalize = background_job_notification_job_finalize;
-#line 1572 "BackgroundJob.c"
+#line 1574 "BackgroundJob.c"
 }
 
 
 static void background_job_notification_job_instance_init (BackgroundJobNotificationJob * self) {
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	self->ref_count = 1;
-#line 1579 "BackgroundJob.c"
+#line 1581 "BackgroundJob.c"
 }
 
 
@@ -1589,7 +1591,7 @@ static void background_job_notification_job_finalize (BackgroundJobNotificationJ
 	_background_job_unref0 (self->background_job);
 #line 86 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	_notification_object_unref0 (self->user);
-#line 1593 "BackgroundJob.c"
+#line 1595 "BackgroundJob.c"
 }
 
 
@@ -1614,7 +1616,7 @@ static gpointer background_job_notification_job_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	return instance;
-#line 1618 "BackgroundJob.c"
+#line 1620 "BackgroundJob.c"
 }
 
 
@@ -1627,7 +1629,7 @@ static void background_job_notification_job_unref (gpointer instance) {
 		BACKGROUND_JOB_NOTIFICATION_JOB_GET_CLASS (self)->finalize (self);
 #line 83 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1631 "BackgroundJob.c"
+#line 1633 "BackgroundJob.c"
 	}
 }
 
@@ -1635,7 +1637,7 @@ static void background_job_notification_job_unref (gpointer instance) {
 static void value_background_job_init (GValue* value) {
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	value->data[0].v_pointer = NULL;
-#line 1639 "BackgroundJob.c"
+#line 1641 "BackgroundJob.c"
 }
 
 
@@ -1644,7 +1646,7 @@ static void value_background_job_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		background_job_unref (value->data[0].v_pointer);
-#line 1648 "BackgroundJob.c"
+#line 1650 "BackgroundJob.c"
 	}
 }
 
@@ -1654,11 +1656,11 @@ static void value_background_job_copy_value (const GValue* src_value, GValue* de
 	if (src_value->data[0].v_pointer) {
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		dest_value->data[0].v_pointer = background_job_ref (src_value->data[0].v_pointer);
-#line 1658 "BackgroundJob.c"
+#line 1660 "BackgroundJob.c"
 	} else {
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1662 "BackgroundJob.c"
+#line 1664 "BackgroundJob.c"
 	}
 }
 
@@ -1666,37 +1668,37 @@ static void value_background_job_copy_value (const GValue* src_value, GValue* de
 static gpointer value_background_job_peek_pointer (const GValue* value) {
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	return value->data[0].v_pointer;
-#line 1670 "BackgroundJob.c"
+#line 1672 "BackgroundJob.c"
 }
 
 
 static gchar* value_background_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (collect_values[0].v_pointer) {
-#line 1677 "BackgroundJob.c"
+#line 1679 "BackgroundJob.c"
 		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) {
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1684 "BackgroundJob.c"
+#line 1686 "BackgroundJob.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.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 1688 "BackgroundJob.c"
+#line 1690 "BackgroundJob.c"
 		}
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		value->data[0].v_pointer = background_job_ref (object);
-#line 1692 "BackgroundJob.c"
+#line 1694 "BackgroundJob.c"
 	} else {
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		value->data[0].v_pointer = NULL;
-#line 1696 "BackgroundJob.c"
+#line 1698 "BackgroundJob.c"
 	}
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	return NULL;
-#line 1700 "BackgroundJob.c"
+#line 1702 "BackgroundJob.c"
 }
 
 
@@ -1707,25 +1709,25 @@ static gchar* value_background_job_lcopy_value (const GValue* value, guint n_col
 	if (!object_p) {
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1711 "BackgroundJob.c"
+#line 1713 "BackgroundJob.c"
 	}
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (!value->data[0].v_pointer) {
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		*object_p = NULL;
-#line 1717 "BackgroundJob.c"
+#line 1719 "BackgroundJob.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1721 "BackgroundJob.c"
+#line 1723 "BackgroundJob.c"
 	} else {
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		*object_p = background_job_ref (value->data[0].v_pointer);
-#line 1725 "BackgroundJob.c"
+#line 1727 "BackgroundJob.c"
 	}
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	return NULL;
-#line 1729 "BackgroundJob.c"
+#line 1731 "BackgroundJob.c"
 }
 
 
@@ -1739,7 +1741,7 @@ GParamSpec* param_spec_background_job (const gchar* name, const gchar* nick, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	return G_PARAM_SPEC (spec);
-#line 1743 "BackgroundJob.c"
+#line 1745 "BackgroundJob.c"
 }
 
 
@@ -1748,7 +1750,7 @@ gpointer value_get_background_job (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKGROUND_JOB), NULL);
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	return value->data[0].v_pointer;
-#line 1752 "BackgroundJob.c"
+#line 1754 "BackgroundJob.c"
 }
 
 
@@ -1768,17 +1770,17 @@ void value_set_background_job (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		background_job_ref (value->data[0].v_pointer);
-#line 1772 "BackgroundJob.c"
+#line 1774 "BackgroundJob.c"
 	} else {
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		value->data[0].v_pointer = NULL;
-#line 1776 "BackgroundJob.c"
+#line 1778 "BackgroundJob.c"
 	}
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (old) {
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		background_job_unref (old);
-#line 1782 "BackgroundJob.c"
+#line 1784 "BackgroundJob.c"
 	}
 }
 
@@ -1797,17 +1799,17 @@ void value_take_background_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 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		value->data[0].v_pointer = v_object;
-#line 1801 "BackgroundJob.c"
+#line 1803 "BackgroundJob.c"
 	} else {
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		value->data[0].v_pointer = NULL;
-#line 1805 "BackgroundJob.c"
+#line 1807 "BackgroundJob.c"
 	}
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	if (old) {
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		background_job_unref (old);
-#line 1811 "BackgroundJob.c"
+#line 1813 "BackgroundJob.c"
 	}
 }
 
@@ -1821,16 +1823,16 @@ 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 = 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 = 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"
-	_tmp0_ = gee_array_list_new (BACKGROUND_JOB_TYPE_NOTIFICATION_JOB, (GBoxedCopyFunc) background_job_notification_job_ref, background_job_notification_job_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (BACKGROUND_JOB_TYPE_NOTIFICATION_JOB, (GBoxedCopyFunc) background_job_notification_job_ref, (GDestroyNotify) background_job_notification_job_unref, NULL, NULL, NULL);
 #line 96 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	background_job_notify_queue = _tmp0_;
-#line 1834 "BackgroundJob.c"
+#line 1836 "BackgroundJob.c"
 }
 
 
@@ -1847,7 +1849,7 @@ static void background_job_instance_init (BackgroundJob * self) {
 	self->priv->notification_priority = G_PRIORITY_DEFAULT_IDLE;
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	self->ref_count = 1;
-#line 1851 "BackgroundJob.c"
+#line 1853 "BackgroundJob.c"
 }
 
 
@@ -1865,7 +1867,7 @@ static void background_job_finalize (BackgroundJob* obj) {
 	_background_job_unref0 (self->priv->self);
 #line 103 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	_abstract_semaphore_unref0 (self->priv->semaphore);
-#line 1869 "BackgroundJob.c"
+#line 1871 "BackgroundJob.c"
 }
 
 
@@ -1890,7 +1892,7 @@ gpointer background_job_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	return instance;
-#line 1894 "BackgroundJob.c"
+#line 1896 "BackgroundJob.c"
 }
 
 
@@ -1903,7 +1905,7 @@ void background_job_unref (gpointer instance) {
 		BACKGROUND_JOB_GET_CLASS (self)->finalize (self);
 #line 65 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1907 "BackgroundJob.c"
+#line 1909 "BackgroundJob.c"
 	}
 }
 
diff --git a/src/threads/Semaphore.c b/src/threads/Semaphore.c
index 34c55e4..5a3b050 100644
--- a/src/threads/Semaphore.c
+++ b/src/threads/Semaphore.c
@@ -1,4 +1,4 @@
-/* Semaphore.c generated by valac 0.34.4, the Vala compiler
+/* Semaphore.c generated by valac 0.34.7, the Vala compiler
  * generated from Semaphore.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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 = 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 = abstract_semaphore_real_do_reset;
+	((AbstractSemaphoreClass *) klass)->do_reset = (gboolean (*)(AbstractSemaphore*)) abstract_semaphore_real_do_reset;
 #line 664 "Semaphore.c"
 }
 
@@ -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 = 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 = semaphore_real_do_wait;
+	((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*)(AbstractSemaphore*)) semaphore_real_do_wait;
 #line 815 "Semaphore.c"
 }
 
@@ -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 = 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 = countdown_semaphore_real_do_wait;
+	((AbstractSemaphoreClass *) klass)->do_wait = (AbstractSemaphoreWaitAction (*)(AbstractSemaphore*)) countdown_semaphore_real_do_wait;
 #line 967 "Semaphore.c"
 }
 
@@ -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 = 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 = 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 = event_semaphore_real_do_reset;
+	((AbstractSemaphoreClass *) klass)->do_reset = (gboolean (*)(AbstractSemaphore*)) event_semaphore_real_do_reset;
 #line 1089 "Semaphore.c"
 }
 
diff --git a/src/threads/Threads.c b/src/threads/Threads.c
index e50f83e..b2cace8 100644
--- a/src/threads/Threads.c
+++ b/src/threads/Threads.c
@@ -1,4 +1,4 @@
-/* Threads.c generated by valac 0.34.4, the Vala compiler
+/* Threads.c generated by valac 0.34.7, 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 312f3e3..ff9d180 100644
--- a/src/threads/Workers.c
+++ b/src/threads/Workers.c
@@ -1,4 +1,4 @@
-/* Workers.c generated by valac 0.34.4, the Vala compiler
+/* Workers.c generated by valac 0.34.7, the Vala compiler
  * generated from Workers.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -207,7 +207,7 @@ static gint64 _background_job_priority_comparator_comparator (void* a, void* b,
 BackgroundJobBatch* background_job_batch_construct (GType object_type) {
 	BackgroundJobBatch * self = NULL;
 #line 10 "/home/jens/Source/shotwell/src/threads/Workers.vala"
-	self = (BackgroundJobBatch*) sorted_list_construct (object_type, TYPE_BACKGROUND_JOB, (GBoxedCopyFunc) background_job_ref, background_job_unref, _background_job_priority_comparator_comparator, NULL);
+	self = (BackgroundJobBatch*) sorted_list_construct (object_type, TYPE_BACKGROUND_JOB, (GBoxedCopyFunc) background_job_ref, (GDestroyNotify) background_job_unref, _background_job_priority_comparator_comparator, NULL);
 #line 9 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	return self;
 #line 214 "Workers.c"
@@ -663,29 +663,30 @@ gint workers_get_pending_job_count (Workers* self) {
 #line 664 "Workers.c"
 	{
 		GAsyncQueue* _tmp0_ = NULL;
+		gint _tmp4_ = 0;
 #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		_tmp0_ = self->priv->queue;
 #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		g_rec_mutex_lock (&self->priv->__lock_queue);
-#line 671 "Workers.c"
+#line 672 "Workers.c"
 		{
 			gint _tmp1_ = 0;
 #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 678 "Workers.c"
+#line 679 "Workers.c"
 			{
 				GAsyncQueue* _tmp2_ = NULL;
 #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 				_tmp2_ = self->priv->queue;
 #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_queue);
-#line 685 "Workers.c"
+#line 686 "Workers.c"
 			}
 #line 80 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			return result;
-#line 689 "Workers.c"
+#line 690 "Workers.c"
 		}
 		__finally11:
 		{
@@ -694,15 +695,15 @@ gint workers_get_pending_job_count (Workers* self) {
 			_tmp3_ = self->priv->queue;
 #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_queue);
-#line 698 "Workers.c"
+#line 699 "Workers.c"
 		}
 #line 79 "/home/jens/Source/shotwell/src/threads/Workers.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 79 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		g_clear_error (&_inner_error_);
 #line 79 "/home/jens/Source/shotwell/src/threads/Workers.vala"
-		return 0;
-#line 706 "Workers.c"
+		return _tmp4_;
+#line 707 "Workers.c"
 	}
 }
 
@@ -714,14 +715,14 @@ static void workers_thread_start (Workers* self, void* ignored) {
 	GError * _inner_error_ = NULL;
 #line 84 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	g_return_if_fail (IS_WORKERS (self));
-#line 718 "Workers.c"
+#line 719 "Workers.c"
 	{
 		GAsyncQueue* _tmp0_ = NULL;
 #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 725 "Workers.c"
+#line 726 "Workers.c"
 		{
 			GAsyncQueue* _tmp1_ = NULL;
 			gpointer _tmp2_ = NULL;
@@ -750,7 +751,7 @@ static void workers_thread_start (Workers* self, void* ignored) {
 			_tmp5_ = self->priv->enqueued;
 #line 92 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			empty = _tmp5_ == 0;
-#line 754 "Workers.c"
+#line 755 "Workers.c"
 		}
 		__finally12:
 		{
@@ -759,7 +760,7 @@ static void workers_thread_start (Workers* self, void* ignored) {
 			_tmp6_ = self->priv->queue;
 #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_queue);
-#line 763 "Workers.c"
+#line 764 "Workers.c"
 		}
 #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -771,7 +772,7 @@ static void workers_thread_start (Workers* self, void* ignored) {
 			g_clear_error (&_inner_error_);
 #line 87 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			return;
-#line 775 "Workers.c"
+#line 776 "Workers.c"
 		}
 	}
 #line 95 "/home/jens/Source/shotwell/src/threads/Workers.vala"
@@ -780,30 +781,30 @@ static void workers_thread_start (Workers* self, void* ignored) {
 	if (!_tmp7_) {
 #line 96 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		background_job_execute (job);
-#line 784 "Workers.c"
+#line 785 "Workers.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	background_job_internal_notify_completion (job);
 #line 100 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	if (empty) {
-#line 790 "Workers.c"
+#line 791 "Workers.c"
 		EventSemaphore* _tmp8_ = NULL;
 #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"
 		abstract_semaphore_notify (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_ABSTRACT_SEMAPHORE, AbstractSemaphore));
-#line 796 "Workers.c"
+#line 797 "Workers.c"
 	}
 #line 84 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	_background_job_unref0 (job);
-#line 800 "Workers.c"
+#line 801 "Workers.c"
 }
 
 
 static void value_workers_init (GValue* value) {
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	value->data[0].v_pointer = NULL;
-#line 807 "Workers.c"
+#line 808 "Workers.c"
 }
 
 
@@ -812,7 +813,7 @@ static void value_workers_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		workers_unref (value->data[0].v_pointer);
-#line 816 "Workers.c"
+#line 817 "Workers.c"
 	}
 }
 
@@ -822,11 +823,11 @@ static void value_workers_copy_value (const GValue* src_value, GValue* dest_valu
 	if (src_value->data[0].v_pointer) {
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		dest_value->data[0].v_pointer = workers_ref (src_value->data[0].v_pointer);
-#line 826 "Workers.c"
+#line 827 "Workers.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 830 "Workers.c"
+#line 831 "Workers.c"
 	}
 }
 
@@ -834,37 +835,37 @@ static void value_workers_copy_value (const GValue* src_value, GValue* dest_valu
 static gpointer value_workers_peek_pointer (const GValue* value) {
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	return value->data[0].v_pointer;
-#line 838 "Workers.c"
+#line 839 "Workers.c"
 }
 
 
 static gchar* value_workers_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	if (collect_values[0].v_pointer) {
-#line 845 "Workers.c"
+#line 846 "Workers.c"
 		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) {
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 852 "Workers.c"
+#line 853 "Workers.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.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 856 "Workers.c"
+#line 857 "Workers.c"
 		}
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		value->data[0].v_pointer = workers_ref (object);
-#line 860 "Workers.c"
+#line 861 "Workers.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		value->data[0].v_pointer = NULL;
-#line 864 "Workers.c"
+#line 865 "Workers.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	return NULL;
-#line 868 "Workers.c"
+#line 869 "Workers.c"
 }
 
 
@@ -875,25 +876,25 @@ static gchar* value_workers_lcopy_value (const GValue* value, guint n_collect_va
 	if (!object_p) {
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 879 "Workers.c"
+#line 880 "Workers.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	if (!value->data[0].v_pointer) {
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		*object_p = NULL;
-#line 885 "Workers.c"
+#line 886 "Workers.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		*object_p = value->data[0].v_pointer;
-#line 889 "Workers.c"
+#line 890 "Workers.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		*object_p = workers_ref (value->data[0].v_pointer);
-#line 893 "Workers.c"
+#line 894 "Workers.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	return NULL;
-#line 897 "Workers.c"
+#line 898 "Workers.c"
 }
 
 
@@ -907,7 +908,7 @@ GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	return G_PARAM_SPEC (spec);
-#line 911 "Workers.c"
+#line 912 "Workers.c"
 }
 
 
@@ -916,7 +917,7 @@ gpointer value_get_workers (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_WORKERS), NULL);
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	return value->data[0].v_pointer;
-#line 920 "Workers.c"
+#line 921 "Workers.c"
 }
 
 
@@ -936,17 +937,17 @@ void value_set_workers (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		workers_ref (value->data[0].v_pointer);
-#line 940 "Workers.c"
+#line 941 "Workers.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		value->data[0].v_pointer = NULL;
-#line 944 "Workers.c"
+#line 945 "Workers.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	if (old) {
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		workers_unref (old);
-#line 950 "Workers.c"
+#line 951 "Workers.c"
 	}
 }
 
@@ -965,17 +966,17 @@ void value_take_workers (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		value->data[0].v_pointer = v_object;
-#line 969 "Workers.c"
+#line 970 "Workers.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		value->data[0].v_pointer = NULL;
-#line 973 "Workers.c"
+#line 974 "Workers.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	if (old) {
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		workers_unref (old);
-#line 979 "Workers.c"
+#line 980 "Workers.c"
 	}
 }
 
@@ -987,7 +988,7 @@ static void workers_class_init (WorkersClass * klass) {
 	((WorkersClass *) klass)->finalize = workers_finalize;
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	g_type_class_add_private (klass, sizeof (WorkersPrivate));
-#line 991 "Workers.c"
+#line 992 "Workers.c"
 }
 
 
@@ -1010,7 +1011,7 @@ static void workers_instance_init (Workers * self) {
 	self->priv->enqueued = 0;
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	self->ref_count = 1;
-#line 1014 "Workers.c"
+#line 1015 "Workers.c"
 }
 
 
@@ -1028,7 +1029,7 @@ static void workers_finalize (Workers* obj) {
 	_g_async_queue_unref0 (self->priv->queue);
 #line 20 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	_abstract_semaphore_unref0 (self->priv->empty_event);
-#line 1032 "Workers.c"
+#line 1033 "Workers.c"
 }
 
 
@@ -1053,7 +1054,7 @@ gpointer workers_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 	return instance;
-#line 1057 "Workers.c"
+#line 1058 "Workers.c"
 }
 
 
@@ -1066,7 +1067,7 @@ void workers_unref (gpointer instance) {
 		WORKERS_GET_CLASS (self)->finalize (self);
 #line 15 "/home/jens/Source/shotwell/src/threads/Workers.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1070 "Workers.c"
+#line 1071 "Workers.c"
 	}
 }
 
diff --git a/src/unit/Unit.c b/src/unit/Unit.c
index 41a26e9..242cbd4 100644
--- a/src/unit/Unit.c
+++ b/src/unit/Unit.c
@@ -1,4 +1,4 @@
-/* Unit.c generated by valac 0.34.4, the Vala compiler
+/* Unit.c generated by valac 0.34.7, 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 40ffa4d..1c584c3 100644
--- a/src/util/KeyValueMap.c
+++ b/src/util/KeyValueMap.c
@@ -1,4 +1,4 @@
-/* KeyValueMap.c generated by valac 0.34.4, the Vala compiler
+/* KeyValueMap.c generated by valac 0.34.7, the Vala compiler
  * generated from KeyValueMap.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -147,7 +147,7 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) {
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp2_ = self->priv->map;
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MAP, GeeMap));
+		_tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp4_ = _tmp3_;
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -253,7 +253,7 @@ GeeSet* key_value_map_get_keys (KeyValueMap* self) {
 #line 28 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->map;
 #line 28 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+	_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 28 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp2_ = _tmp1_;
 #line 28 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -1115,7 +1115,7 @@ static void key_value_map_instance_init (KeyValueMap * self) {
 #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"
-	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 9 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	self->priv->map = _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
diff --git a/src/util/Util.c b/src/util/Util.c
index b7aff8f..65ba704 100644
--- a/src/util/Util.c
+++ b/src/util/Util.c
@@ -1,4 +1,4 @@
-/* Util.c generated by valac 0.34.4, the Vala compiler
+/* Util.c generated by valac 0.34.7, 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 211fbe3..3f4b228 100644
--- a/src/util/file.c
+++ b/src/util/file.c
@@ -1,4 +1,4 @@
-/* file.c generated by valac 0.34.4, the Vala compiler
+/* file.c generated by valac 0.34.7, the Vala compiler
  * generated from file.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -54,10 +54,11 @@ static gpointer _g_error_copy0 (gpointer self) {
 
 gboolean claim_file (GFile* file, GError** error) {
 	gboolean result = FALSE;
+	gboolean _tmp11_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 12 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 61 "file.c"
+#line 62 "file.c"
 	{
 		GFile* _tmp0_ = NULL;
 		GFileOutputStream* _tmp1_ = NULL;
@@ -72,14 +73,14 @@ gboolean claim_file (GFile* file, GError** error) {
 		_g_object_unref0 (_tmp2_);
 #line 14 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 76 "file.c"
+#line 77 "file.c"
 			goto __catch0_g_error;
 		}
 #line 17 "/home/jens/Source/shotwell/src/util/file.vala"
 		result = TRUE;
 #line 17 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 83 "file.c"
+#line 84 "file.c"
 	}
 	goto __finally0;
 	__catch0_g_error:
@@ -94,7 +95,7 @@ gboolean claim_file (GFile* file, GError** error) {
 		_tmp3_ = err;
 #line 20 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (!g_error_matches (_tmp3_, G_IO_ERROR, G_IO_ERROR_EXISTS)) {
-#line 98 "file.c"
+#line 99 "file.c"
 			GFile* _tmp4_ = NULL;
 			gchar* _tmp5_ = NULL;
 			gchar* _tmp6_ = NULL;
@@ -124,7 +125,7 @@ gboolean claim_file (GFile* file, GError** error) {
 			_inner_error_ = _tmp10_;
 #line 23 "/home/jens/Source/shotwell/src/util/file.vala"
 			_g_error_free0 (err);
-#line 128 "file.c"
+#line 129 "file.c"
 			goto __finally0;
 		}
 #line 26 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -133,14 +134,14 @@ gboolean claim_file (GFile* file, GError** error) {
 		_g_error_free0 (err);
 #line 26 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 137 "file.c"
+#line 138 "file.c"
 	}
 	__finally0:
 #line 13 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_propagate_error (error, _inner_error_);
 #line 13 "/home/jens/Source/shotwell/src/util/file.vala"
-	return FALSE;
-#line 144 "file.c"
+	return _tmp11_;
+#line 145 "file.c"
 }
 
 
@@ -190,7 +191,7 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 		_g_object_unref0 (file);
 #line 39 "/home/jens/Source/shotwell/src/util/file.vala"
 		return NULL;
-#line 194 "file.c"
+#line 195 "file.c"
 	}
 #line 39 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp3_) {
@@ -202,11 +203,11 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 		if (collision) {
 #line 42 "/home/jens/Source/shotwell/src/util/file.vala"
 			*collision = _vala_collision;
-#line 206 "file.c"
+#line 207 "file.c"
 		}
 #line 42 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 210 "file.c"
+#line 211 "file.c"
 	}
 #line 46 "/home/jens/Source/shotwell/src/util/file.vala"
 	_vala_collision = TRUE;
@@ -222,19 +223,19 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 	_g_free0 (ext);
 #line 49 "/home/jens/Source/shotwell/src/util/file.vala"
 	ext = _tmp8_;
-#line 226 "file.c"
+#line 227 "file.c"
 	{
 		gint ctr = 0;
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 		ctr = 1;
-#line 231 "file.c"
+#line 232 "file.c"
 		{
 			gboolean _tmp9_ = FALSE;
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp9_ = TRUE;
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 			while (TRUE) {
-#line 238 "file.c"
+#line 239 "file.c"
 				gint _tmp11_ = 0;
 				gchar* _tmp12_ = NULL;
 				const gchar* _tmp13_ = NULL;
@@ -248,13 +249,13 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 				gboolean _tmp27_ = FALSE;
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 				if (!_tmp9_) {
-#line 252 "file.c"
+#line 253 "file.c"
 					gint _tmp10_ = 0;
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 					_tmp10_ = ctr;
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 					ctr = _tmp10_ + 1;
-#line 258 "file.c"
+#line 259 "file.c"
 				}
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 				_tmp9_ = FALSE;
@@ -264,13 +265,13 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 				if (!(_tmp11_ < G_MAXINT)) {
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 					break;
-#line 268 "file.c"
+#line 269 "file.c"
 				}
 #line 53 "/home/jens/Source/shotwell/src/util/file.vala"
 				_tmp13_ = ext;
 #line 53 "/home/jens/Source/shotwell/src/util/file.vala"
 				if (_tmp13_ != NULL) {
-#line 274 "file.c"
+#line 275 "file.c"
 					const gchar* _tmp14_ = NULL;
 					gint _tmp15_ = 0;
 					const gchar* _tmp16_ = NULL;
@@ -287,7 +288,7 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 					_g_free0 (_tmp12_);
 #line 53 "/home/jens/Source/shotwell/src/util/file.vala"
 					_tmp12_ = _tmp17_;
-#line 291 "file.c"
+#line 292 "file.c"
 				} else {
 					const gchar* _tmp18_ = NULL;
 					gint _tmp19_ = 0;
@@ -302,7 +303,7 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 					_g_free0 (_tmp12_);
 #line 53 "/home/jens/Source/shotwell/src/util/file.vala"
 					_tmp12_ = _tmp20_;
-#line 306 "file.c"
+#line 307 "file.c"
 				}
 #line 53 "/home/jens/Source/shotwell/src/util/file.vala"
 				_tmp21_ = g_strdup (_tmp12_);
@@ -340,7 +341,7 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 					_g_object_unref0 (file);
 #line 56 "/home/jens/Source/shotwell/src/util/file.vala"
 					return NULL;
-#line 344 "file.c"
+#line 345 "file.c"
 				}
 #line 56 "/home/jens/Source/shotwell/src/util/file.vala"
 				if (_tmp25_) {
@@ -358,17 +359,17 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 					if (collision) {
 #line 57 "/home/jens/Source/shotwell/src/util/file.vala"
 						*collision = _vala_collision;
-#line 362 "file.c"
+#line 363 "file.c"
 					}
 #line 57 "/home/jens/Source/shotwell/src/util/file.vala"
 					return result;
-#line 366 "file.c"
+#line 367 "file.c"
 				}
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 				_g_free0 (new_name);
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 				_g_free0 (_tmp12_);
-#line 372 "file.c"
+#line 373 "file.c"
 			}
 		}
 	}
@@ -396,11 +397,11 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 	if (collision) {
 #line 62 "/home/jens/Source/shotwell/src/util/file.vala"
 		*collision = _vala_collision;
-#line 400 "file.c"
+#line 401 "file.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 404 "file.c"
+#line 405 "file.c"
 }
 
 
@@ -423,7 +424,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 427 "file.c"
+#line 428 "file.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -431,7 +432,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 435 "file.c"
+#line 436 "file.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -443,7 +444,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 447 "file.c"
+#line 448 "file.c"
 	}
 }
 
@@ -467,21 +468,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 471 "file.c"
+#line 472 "file.c"
 		glong _tmp2_ = 0L;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 477 "file.c"
+#line 478 "file.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 481 "file.c"
+#line 482 "file.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 485 "file.c"
+#line 486 "file.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -493,7 +494,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 497 "file.c"
+#line 498 "file.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -503,13 +504,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 507 "file.c"
+#line 508 "file.c"
 	}
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 513 "file.c"
+#line 514 "file.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -523,7 +524,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 527 "file.c"
+#line 528 "file.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -533,13 +534,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 537 "file.c"
+#line 538 "file.c"
 	}
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 543 "file.c"
+#line 544 "file.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -548,7 +549,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 552 "file.c"
+#line 553 "file.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -568,7 +569,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 572 "file.c"
+#line 573 "file.c"
 }
 
 
@@ -591,7 +592,7 @@ void disassemble_filename (const gchar* basename, gchar** name, gchar** ext) {
 	_tmp2_ = offset;
 #line 67 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp2_ <= ((glong) 0)) {
-#line 595 "file.c"
+#line 596 "file.c"
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 #line 68 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -606,7 +607,7 @@ void disassemble_filename (const gchar* basename, gchar** name, gchar** ext) {
 		_g_free0 (_vala_ext);
 #line 69 "/home/jens/Source/shotwell/src/util/file.vala"
 		_vala_ext = NULL;
-#line 610 "file.c"
+#line 611 "file.c"
 	} else {
 		const gchar* _tmp5_ = NULL;
 		glong _tmp6_ = 0L;
@@ -634,27 +635,27 @@ void disassemble_filename (const gchar* basename, gchar** name, gchar** ext) {
 		_g_free0 (_vala_ext);
 #line 72 "/home/jens/Source/shotwell/src/util/file.vala"
 		_vala_ext = _tmp10_;
-#line 638 "file.c"
+#line 639 "file.c"
 	}
 #line 65 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (name) {
 #line 65 "/home/jens/Source/shotwell/src/util/file.vala"
 		*name = _vala_name;
-#line 644 "file.c"
+#line 645 "file.c"
 	} else {
 #line 65 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_free0 (_vala_name);
-#line 648 "file.c"
+#line 649 "file.c"
 	}
 #line 65 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (ext) {
 #line 65 "/home/jens/Source/shotwell/src/util/file.vala"
 		*ext = _vala_ext;
-#line 654 "file.c"
+#line 655 "file.c"
 	} else {
 #line 65 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_free0 (_vala_ext);
-#line 658 "file.c"
+#line 659 "file.c"
 	}
 }
 
@@ -683,13 +684,13 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 	_tmp2_ = type;
 #line 79 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp2_ == G_FILE_TYPE_REGULAR) {
-#line 687 "file.c"
+#line 688 "file.c"
 		GFileInfo* info = NULL;
-		GFileInfo* _tmp16_ = NULL;
-		gint64 _tmp17_ = 0LL;
+		GFileInfo* _tmp17_ = NULL;
+		gint64 _tmp18_ = 0LL;
 #line 80 "/home/jens/Source/shotwell/src/util/file.vala"
 		info = NULL;
-#line 693 "file.c"
+#line 694 "file.c"
 		{
 			GFileInfo* _tmp3_ = NULL;
 			GFile* _tmp4_ = NULL;
@@ -706,7 +707,7 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 			_tmp3_ = _tmp6_;
 #line 82 "/home/jens/Source/shotwell/src/util/file.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 710 "file.c"
+#line 711 "file.c"
 				goto __catch1_g_error;
 			}
 #line 82 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -719,7 +720,7 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 			info = _tmp7_;
 #line 81 "/home/jens/Source/shotwell/src/util/file.vala"
 			_g_object_unref0 (_tmp3_);
-#line 723 "file.c"
+#line 724 "file.c"
 		}
 		goto __finally1;
 		__catch1_g_error:
@@ -739,7 +740,7 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 			_tmp8_ = err;
 #line 85 "/home/jens/Source/shotwell/src/util/file.vala"
 			if (g_error_matches (_tmp8_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-#line 743 "file.c"
+#line 744 "file.c"
 				GError* _tmp9_ = NULL;
 				GError* _tmp10_ = NULL;
 #line 86 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -750,7 +751,7 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 				_inner_error_ = _tmp10_;
 #line 86 "/home/jens/Source/shotwell/src/util/file.vala"
 				_g_error_free0 (err);
-#line 754 "file.c"
+#line 755 "file.c"
 				goto __finally1;
 			}
 #line 88 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -775,118 +776,120 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 			_g_object_unref0 (info);
 #line 90 "/home/jens/Source/shotwell/src/util/file.vala"
 			return result;
-#line 779 "file.c"
+#line 780 "file.c"
 		}
 		__finally1:
 #line 81 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 785 "file.c"
+			guint64 _tmp16_ = 0ULL;
 #line 81 "/home/jens/Source/shotwell/src/util/file.vala"
 			g_propagate_error (error, _inner_error_);
 #line 81 "/home/jens/Source/shotwell/src/util/file.vala"
 			_g_object_unref0 (info);
 #line 81 "/home/jens/Source/shotwell/src/util/file.vala"
-			return 0ULL;
-#line 790 "file.c"
+			return _tmp16_;
+#line 793 "file.c"
 		}
 #line 93 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp16_ = info;
+		_tmp17_ = info;
 #line 93 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp17_ = g_file_info_get_size (_tmp16_);
+		_tmp18_ = g_file_info_get_size (_tmp17_);
 #line 93 "/home/jens/Source/shotwell/src/util/file.vala"
-		result = (guint64) _tmp17_;
+		result = (guint64) _tmp18_;
 #line 93 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_object_unref0 (info);
 #line 93 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 802 "file.c"
+#line 805 "file.c"
 	} else {
-		GFileType _tmp18_ = 0;
+		GFileType _tmp19_ = 0;
 #line 94 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp18_ = type;
+		_tmp19_ = type;
 #line 94 "/home/jens/Source/shotwell/src/util/file.vala"
-		if (_tmp18_ != G_FILE_TYPE_DIRECTORY) {
+		if (_tmp19_ != G_FILE_TYPE_DIRECTORY) {
 #line 95 "/home/jens/Source/shotwell/src/util/file.vala"
 			result = (guint64) 0;
 #line 95 "/home/jens/Source/shotwell/src/util/file.vala"
 			return result;
-#line 813 "file.c"
+#line 816 "file.c"
 		}
 	}
 	{
-		GFileEnumerator* _tmp19_ = NULL;
-		GFile* _tmp20_ = NULL;
-		GCancellable* _tmp21_ = NULL;
-		GFileEnumerator* _tmp22_ = NULL;
+		GFileEnumerator* _tmp20_ = NULL;
+		GFile* _tmp21_ = NULL;
+		GCancellable* _tmp22_ = NULL;
 		GFileEnumerator* _tmp23_ = NULL;
 		GFileEnumerator* _tmp24_ = NULL;
+		GFileEnumerator* _tmp25_ = NULL;
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp20_ = file_or_dir;
+		_tmp21_ = file_or_dir;
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp21_ = cancellable;
+		_tmp22_ = cancellable;
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp22_ = g_file_enumerate_children (_tmp20_, G_FILE_ATTRIBUTE_STANDARD_NAME, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, _tmp21_, &_inner_error_);
+		_tmp23_ = g_file_enumerate_children (_tmp21_, G_FILE_ATTRIBUTE_STANDARD_NAME, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, _tmp22_, &_inner_error_);
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp19_ = _tmp22_;
+		_tmp20_ = _tmp23_;
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 833 "file.c"
+#line 836 "file.c"
 			goto __catch2_g_error;
 		}
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp23_ = _tmp19_;
+		_tmp24_ = _tmp20_;
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp19_ = NULL;
+		_tmp20_ = NULL;
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_object_unref0 (enumerator);
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
-		enumerator = _tmp23_;
+		enumerator = _tmp24_;
 #line 102 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp24_ = enumerator;
+		_tmp25_ = enumerator;
 #line 102 "/home/jens/Source/shotwell/src/util/file.vala"
-		if (_tmp24_ == NULL) {
+		if (_tmp25_ == NULL) {
 #line 103 "/home/jens/Source/shotwell/src/util/file.vala"
 			result = (guint64) 0;
 #line 103 "/home/jens/Source/shotwell/src/util/file.vala"
-			_g_object_unref0 (_tmp19_);
+			_g_object_unref0 (_tmp20_);
 #line 103 "/home/jens/Source/shotwell/src/util/file.vala"
 			_g_object_unref0 (enumerator);
 #line 103 "/home/jens/Source/shotwell/src/util/file.vala"
 			return result;
-#line 856 "file.c"
+#line 859 "file.c"
 		}
 #line 99 "/home/jens/Source/shotwell/src/util/file.vala"
-		_g_object_unref0 (_tmp19_);
-#line 860 "file.c"
+		_g_object_unref0 (_tmp20_);
+#line 863 "file.c"
 	}
 	goto __finally2;
 	__catch2_g_error:
 	{
 		GError* err = NULL;
-		gboolean _tmp25_ = FALSE;
-		GError* _tmp26_ = NULL;
-		GError* _tmp28_ = NULL;
+		gboolean _tmp26_ = FALSE;
+		GError* _tmp27_ = NULL;
 		GError* _tmp29_ = NULL;
+		GError* _tmp30_ = NULL;
 #line 99 "/home/jens/Source/shotwell/src/util/file.vala"
 		err = _inner_error_;
 #line 99 "/home/jens/Source/shotwell/src/util/file.vala"
 		_inner_error_ = NULL;
 #line 106 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp26_ = err;
+		_tmp27_ = err;
 #line 106 "/home/jens/Source/shotwell/src/util/file.vala"
-		if (g_error_matches (_tmp26_, G_FILE_ERROR, G_FILE_ERROR_PERM)) {
+		if (g_error_matches (_tmp27_, G_FILE_ERROR, G_FILE_ERROR_PERM)) {
 #line 106 "/home/jens/Source/shotwell/src/util/file.vala"
-			_tmp25_ = TRUE;
-#line 880 "file.c"
+			_tmp26_ = TRUE;
+#line 883 "file.c"
 		} else {
-			GError* _tmp27_ = NULL;
+			GError* _tmp28_ = NULL;
 #line 106 "/home/jens/Source/shotwell/src/util/file.vala"
-			_tmp27_ = err;
+			_tmp28_ = err;
 #line 106 "/home/jens/Source/shotwell/src/util/file.vala"
-			_tmp25_ = g_error_matches (_tmp27_, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED);
-#line 887 "file.c"
+			_tmp26_ = g_error_matches (_tmp28_, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED);
+#line 890 "file.c"
 		}
 #line 106 "/home/jens/Source/shotwell/src/util/file.vala"
-		if (_tmp25_) {
+		if (_tmp26_) {
 #line 107 "/home/jens/Source/shotwell/src/util/file.vala"
 			result = (guint64) 0;
 #line 107 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -895,29 +898,31 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 			_g_object_unref0 (enumerator);
 #line 107 "/home/jens/Source/shotwell/src/util/file.vala"
 			return result;
-#line 899 "file.c"
+#line 902 "file.c"
 		}
 #line 109 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp28_ = err;
+		_tmp29_ = err;
 #line 109 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp29_ = _g_error_copy0 (_tmp28_);
+		_tmp30_ = _g_error_copy0 (_tmp29_);
 #line 109 "/home/jens/Source/shotwell/src/util/file.vala"
-		_inner_error_ = _tmp29_;
+		_inner_error_ = _tmp30_;
 #line 109 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_error_free0 (err);
-#line 909 "file.c"
+#line 912 "file.c"
 		goto __finally2;
 	}
 	__finally2:
 #line 99 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 918 "file.c"
+		guint64 _tmp31_ = 0ULL;
 #line 99 "/home/jens/Source/shotwell/src/util/file.vala"
 		g_propagate_error (error, _inner_error_);
 #line 99 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_object_unref0 (enumerator);
 #line 99 "/home/jens/Source/shotwell/src/util/file.vala"
-		return 0ULL;
-#line 921 "file.c"
+		return _tmp31_;
+#line 926 "file.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/util/file.vala"
 	total_bytes = (guint64) 0;
@@ -925,33 +930,35 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 	info = NULL;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
 	while (TRUE) {
-#line 929 "file.c"
-		GFileInfo* _tmp30_ = NULL;
-		GFileEnumerator* _tmp31_ = NULL;
-		GCancellable* _tmp32_ = NULL;
-		GFileInfo* _tmp33_ = NULL;
-		GFileInfo* _tmp34_ = NULL;
+#line 934 "file.c"
+		GFileInfo* _tmp32_ = NULL;
+		GFileEnumerator* _tmp33_ = NULL;
+		GCancellable* _tmp34_ = NULL;
 		GFileInfo* _tmp35_ = NULL;
-		guint64 _tmp36_ = 0ULL;
-		GFile* _tmp37_ = NULL;
+		GFileInfo* _tmp37_ = NULL;
 		GFileInfo* _tmp38_ = NULL;
-		const gchar* _tmp39_ = NULL;
+		guint64 _tmp39_ = 0ULL;
 		GFile* _tmp40_ = NULL;
-		GFile* _tmp41_ = NULL;
-		GCancellable* _tmp42_ = NULL;
-		guint64 _tmp43_ = 0ULL;
-		guint64 _tmp44_ = 0ULL;
-		guint64 _tmp45_ = 0ULL;
+		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;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp31_ = enumerator;
+		_tmp33_ = enumerator;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp32_ = cancellable;
+		_tmp34_ = cancellable;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp33_ = g_file_enumerator_next_file (_tmp31_, _tmp32_, &_inner_error_);
+		_tmp35_ = g_file_enumerator_next_file (_tmp33_, _tmp34_, &_inner_error_);
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp30_ = _tmp33_;
+		_tmp32_ = _tmp35_;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 961 "file.c"
+			guint64 _tmp36_ = 0ULL;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
 			g_propagate_error (error, _inner_error_);
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -959,68 +966,70 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
 			_g_object_unref0 (enumerator);
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-			return 0ULL;
-#line 964 "file.c"
+			return _tmp36_;
+#line 971 "file.c"
 		}
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp34_ = _tmp30_;
+		_tmp37_ = _tmp32_;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp30_ = NULL;
+		_tmp32_ = NULL;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_object_unref0 (info);
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-		info = _tmp34_;
+		info = _tmp37_;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp35_ = info;
+		_tmp38_ = info;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-		if (!(_tmp35_ != NULL)) {
+		if (!(_tmp38_ != NULL)) {
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-			_g_object_unref0 (_tmp30_);
+			_g_object_unref0 (_tmp32_);
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
 			break;
-#line 982 "file.c"
+#line 989 "file.c"
 		}
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp37_ = file_or_dir;
+		_tmp40_ = file_or_dir;
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp38_ = info;
+		_tmp41_ = info;
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp39_ = g_file_info_get_name (_tmp38_);
+		_tmp42_ = g_file_info_get_name (_tmp41_);
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp40_ = g_file_get_child (_tmp37_, _tmp39_);
+		_tmp43_ = g_file_get_child (_tmp40_, _tmp42_);
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp41_ = _tmp40_;
+		_tmp44_ = _tmp43_;
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp42_ = cancellable;
+		_tmp45_ = cancellable;
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp43_ = query_total_file_size (_tmp41_, _tmp42_, &_inner_error_);
+		_tmp46_ = query_total_file_size (_tmp44_, _tmp45_, &_inner_error_);
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp44_ = _tmp43_;
+		_tmp47_ = _tmp46_;
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_g_object_unref0 (_tmp41_);
+		_g_object_unref0 (_tmp44_);
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp36_ = _tmp44_;
+		_tmp39_ = _tmp47_;
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1013 "file.c"
+			guint64 _tmp48_ = 0ULL;
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
 			g_propagate_error (error, _inner_error_);
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-			_g_object_unref0 (_tmp30_);
+			_g_object_unref0 (_tmp32_);
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
 			_g_object_unref0 (info);
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
 			_g_object_unref0 (enumerator);
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-			return 0ULL;
-#line 1016 "file.c"
+			return _tmp48_;
+#line 1025 "file.c"
 		}
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp45_ = total_bytes;
+		_tmp49_ = total_bytes;
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		total_bytes = _tmp45_ + _tmp36_;
+		total_bytes = _tmp49_ + _tmp39_;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-		_g_object_unref0 (_tmp30_);
-#line 1024 "file.c"
+		_g_object_unref0 (_tmp32_);
+#line 1033 "file.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/util/file.vala"
 	result = total_bytes;
@@ -1030,7 +1039,7 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 	_g_object_unref0 (enumerator);
 #line 118 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1034 "file.c"
+#line 1043 "file.c"
 }
 
 
@@ -1062,7 +1071,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 	_tmp2_ = type;
 #line 128 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp2_ != G_FILE_TYPE_DIRECTORY) {
-#line 1066 "file.c"
+#line 1075 "file.c"
 		GFile* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -1094,7 +1103,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 		g_propagate_error (error, _inner_error_);
 #line 129 "/home/jens/Source/shotwell/src/util/file.vala"
 		return;
-#line 1098 "file.c"
+#line 1107 "file.c"
 	}
 #line 131 "/home/jens/Source/shotwell/src/util/file.vala"
 	_tmp10_ = dir;
@@ -1110,7 +1119,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 		g_propagate_error (error, _inner_error_);
 #line 131 "/home/jens/Source/shotwell/src/util/file.vala"
 		return;
-#line 1114 "file.c"
+#line 1123 "file.c"
 	}
 #line 133 "/home/jens/Source/shotwell/src/util/file.vala"
 	info = NULL;
@@ -1118,7 +1127,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 	i = (guint64) 0;
 #line 135 "/home/jens/Source/shotwell/src/util/file.vala"
 	while (TRUE) {
-#line 1122 "file.c"
+#line 1131 "file.c"
 		GFileInfo* _tmp13_ = NULL;
 		GFileEnumerator* _tmp14_ = NULL;
 		GCancellable* _tmp15_ = NULL;
@@ -1155,7 +1164,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 			_g_object_unref0 (enumerator);
 #line 135 "/home/jens/Source/shotwell/src/util/file.vala"
 			return;
-#line 1159 "file.c"
+#line 1168 "file.c"
 		}
 #line 135 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp17_ = _tmp13_;
@@ -1173,7 +1182,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 			_g_object_unref0 (_tmp13_);
 #line 135 "/home/jens/Source/shotwell/src/util/file.vala"
 			break;
-#line 1177 "file.c"
+#line 1186 "file.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp19_ = info;
@@ -1185,13 +1194,13 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 			_g_object_unref0 (_tmp13_);
 #line 137 "/home/jens/Source/shotwell/src/util/file.vala"
 			continue;
-#line 1189 "file.c"
+#line 1198 "file.c"
 		}
 #line 139 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp22_ = exceptions;
 #line 139 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (_tmp22_ != NULL) {
-#line 1195 "file.c"
+#line 1204 "file.c"
 			GeeSet* _tmp23_ = NULL;
 			GFileInfo* _tmp24_ = NULL;
 			const gchar* _tmp25_ = NULL;
@@ -1206,11 +1215,11 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 			_tmp26_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_);
 #line 139 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp21_ = _tmp26_;
-#line 1210 "file.c"
+#line 1219 "file.c"
 		} else {
 #line 139 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp21_ = FALSE;
-#line 1214 "file.c"
+#line 1223 "file.c"
 		}
 #line 139 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (_tmp21_) {
@@ -1218,7 +1227,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 			_g_object_unref0 (_tmp13_);
 #line 140 "/home/jens/Source/shotwell/src/util/file.vala"
 			continue;
-#line 1222 "file.c"
+#line 1231 "file.c"
 		}
 #line 142 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp27_ = dir;
@@ -1230,7 +1239,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 		_tmp30_ = g_file_get_child (_tmp27_, _tmp29_);
 #line 142 "/home/jens/Source/shotwell/src/util/file.vala"
 		file = _tmp30_;
-#line 1234 "file.c"
+#line 1243 "file.c"
 		{
 			GFile* _tmp31_ = NULL;
 			GCancellable* _tmp32_ = NULL;
@@ -1242,7 +1251,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 			g_file_delete (_tmp31_, _tmp32_, &_inner_error_);
 #line 144 "/home/jens/Source/shotwell/src/util/file.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1246 "file.c"
+#line 1255 "file.c"
 				goto __catch3_g_error;
 			}
 		}
@@ -1275,7 +1284,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 			_g_free0 (_tmp35_);
 #line 143 "/home/jens/Source/shotwell/src/util/file.vala"
 			_g_error_free0 (err);
-#line 1279 "file.c"
+#line 1288 "file.c"
 		}
 		__finally3:
 #line 143 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1292,7 +1301,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 			_g_object_unref0 (enumerator);
 #line 143 "/home/jens/Source/shotwell/src/util/file.vala"
 			return;
-#line 1296 "file.c"
+#line 1305 "file.c"
 		}
 #line 149 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp39_ = monitor;
@@ -1300,21 +1309,21 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 		_tmp39__target = monitor_target;
 #line 149 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (_tmp39_ != NULL) {
-#line 1304 "file.c"
+#line 1313 "file.c"
 			guint64 _tmp40_ = 0ULL;
 #line 149 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp40_ = file_count;
 #line 149 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp38_ = _tmp40_ > ((guint64) 0);
-#line 1310 "file.c"
+#line 1319 "file.c"
 		} else {
 #line 149 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp38_ = FALSE;
-#line 1314 "file.c"
+#line 1323 "file.c"
 		}
 #line 149 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (_tmp38_) {
-#line 1318 "file.c"
+#line 1327 "file.c"
 			ProgressMonitor _tmp41_ = NULL;
 			void* _tmp41__target = NULL;
 			guint64 _tmp42_ = 0ULL;
@@ -1334,19 +1343,19 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 			_tmp44_ = i;
 #line 150 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp41_ (_tmp42_, _tmp44_, TRUE, _tmp41__target);
-#line 1338 "file.c"
+#line 1347 "file.c"
 		}
 #line 135 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_object_unref0 (file);
 #line 135 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_object_unref0 (_tmp13_);
-#line 1344 "file.c"
+#line 1353 "file.c"
 	}
 #line 125 "/home/jens/Source/shotwell/src/util/file.vala"
 	_g_object_unref0 (info);
 #line 125 "/home/jens/Source/shotwell/src/util/file.vala"
 	_g_object_unref0 (enumerator);
-#line 1350 "file.c"
+#line 1359 "file.c"
 }
 
 
@@ -1355,8 +1364,8 @@ time_t query_file_modified (GFile* file, GError** error) {
 	GFileInfo* info = NULL;
 	GFile* _tmp0_ = NULL;
 	GFileInfo* _tmp1_ = NULL;
-	GTimeVal _tmp2_ = {0};
-	glong _tmp3_ = 0L;
+	GTimeVal _tmp3_ = {0};
+	glong _tmp4_ = 0L;
 	GError * _inner_error_ = NULL;
 #line 154 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail (G_IS_FILE (file), 0);
@@ -1368,23 +1377,25 @@ time_t query_file_modified (GFile* file, GError** error) {
 	info = _tmp1_;
 #line 155 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1381 "file.c"
+		time_t _tmp2_ = 0;
 #line 155 "/home/jens/Source/shotwell/src/util/file.vala"
 		g_propagate_error (error, _inner_error_);
 #line 155 "/home/jens/Source/shotwell/src/util/file.vala"
-		return 0;
-#line 1376 "file.c"
+		return _tmp2_;
+#line 1387 "file.c"
 	}
 #line 158 "/home/jens/Source/shotwell/src/util/file.vala"
-	g_file_info_get_modification_time (info, &_tmp2_);
+	g_file_info_get_modification_time (info, &_tmp3_);
 #line 158 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp3_ = _tmp2_.tv_sec;
+	_tmp4_ = _tmp3_.tv_sec;
 #line 158 "/home/jens/Source/shotwell/src/util/file.vala"
-	result = (time_t) _tmp3_;
+	result = (time_t) _tmp4_;
 #line 158 "/home/jens/Source/shotwell/src/util/file.vala"
 	_g_object_unref0 (info);
 #line 158 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1388 "file.c"
+#line 1399 "file.c"
 }
 
 
@@ -1402,7 +1413,7 @@ gboolean query_is_directory (GFile* file) {
 	result = _tmp1_ == G_FILE_TYPE_DIRECTORY;
 #line 162 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1406 "file.c"
+#line 1417 "file.c"
 }
 
 
@@ -1413,13 +1424,13 @@ gboolean query_is_directory_empty (GFile* dir, GError** error) {
 	GFileEnumerator* enumerator = NULL;
 	GFile* _tmp2_ = NULL;
 	GFileEnumerator* _tmp3_ = NULL;
-	GFileEnumerator* _tmp4_ = NULL;
-	GFileInfo* _tmp5_ = NULL;
-	GFileEnumerator* _tmp6_ = NULL;
-	GFileInfo* _tmp7_ = NULL;
+	GFileEnumerator* _tmp5_ = NULL;
+	GFileInfo* _tmp6_ = NULL;
+	GFileEnumerator* _tmp7_ = NULL;
 	GFileInfo* _tmp8_ = NULL;
-	GFileInfo* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
+	GFileInfo* _tmp10_ = NULL;
+	GFileInfo* _tmp11_ = NULL;
+	gboolean _tmp12_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 165 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail (G_IS_FILE (dir), FALSE);
@@ -1433,7 +1444,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 1437 "file.c"
+#line 1448 "file.c"
 	}
 #line 169 "/home/jens/Source/shotwell/src/util/file.vala"
 	_tmp2_ = dir;
@@ -1443,59 +1454,63 @@ 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"
+		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 FALSE;
-#line 1451 "file.c"
+		return _tmp4_;
+#line 1464 "file.c"
 	}
 #line 171 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp4_ = enumerator;
+	_tmp5_ = enumerator;
 #line 171 "/home/jens/Source/shotwell/src/util/file.vala"
-	if (_tmp4_ == NULL) {
+	if (_tmp5_ == NULL) {
 #line 172 "/home/jens/Source/shotwell/src/util/file.vala"
 		result = FALSE;
 #line 172 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_object_unref0 (enumerator);
 #line 172 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 1463 "file.c"
+#line 1476 "file.c"
 	}
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp6_ = enumerator;
+	_tmp7_ = enumerator;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp7_ = g_file_enumerator_next_file (_tmp6_, NULL, &_inner_error_);
+	_tmp8_ = g_file_enumerator_next_file (_tmp7_, NULL, &_inner_error_);
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp5_ = _tmp7_;
+	_tmp6_ = _tmp8_;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1486 "file.c"
+		gboolean _tmp9_ = FALSE;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
 		g_propagate_error (error, _inner_error_);
 #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 FALSE;
-#line 1479 "file.c"
+		return _tmp9_;
+#line 1494 "file.c"
 	}
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp8_ = _tmp5_;
+	_tmp10_ = _tmp6_;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp5_ = NULL;
+	_tmp6_ = NULL;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp9_ = _tmp8_;
+	_tmp11_ = _tmp10_;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp10_ = _tmp9_ == NULL;
+	_tmp12_ = _tmp11_ == NULL;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_g_object_unref0 (_tmp9_);
+	_g_object_unref0 (_tmp11_);
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	result = _tmp10_;
+	result = _tmp12_;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_g_object_unref0 (_tmp5_);
+	_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 1499 "file.c"
+#line 1514 "file.c"
 }
 
 
@@ -1532,7 +1547,7 @@ 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 1536 "file.c"
+#line 1551 "file.c"
 		gchar* _tmp6_ = NULL;
 #line 183 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp6_ = g_strdup ("~");
@@ -1544,7 +1559,7 @@ gchar* get_display_pathname (GFile* file) {
 		_g_free0 (path);
 #line 183 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 1548 "file.c"
+#line 1563 "file.c"
 	}
 #line 185 "/home/jens/Source/shotwell/src/util/file.vala"
 	_tmp7_ = path;
@@ -1554,7 +1569,7 @@ 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 1558 "file.c"
+#line 1573 "file.c"
 		const gchar* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		gint _tmp12_ = 0;
@@ -1589,7 +1604,7 @@ gchar* get_display_pathname (GFile* file) {
 		_g_free0 (path);
 #line 186 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 1593 "file.c"
+#line 1608 "file.c"
 	}
 #line 188 "/home/jens/Source/shotwell/src/util/file.vala"
 	result = path;
@@ -1597,7 +1612,7 @@ gchar* get_display_pathname (GFile* file) {
 	_g_free0 (home);
 #line 188 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1601 "file.c"
+#line 1616 "file.c"
 }
 
 
@@ -1619,7 +1634,7 @@ 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 1623 "file.c"
+#line 1638 "file.c"
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 #line 193 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1630,7 +1645,7 @@ gchar* strip_pretty_path (const gchar* path) {
 		result = _tmp3_;
 #line 193 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 1634 "file.c"
+#line 1649 "file.c"
 	}
 #line 195 "/home/jens/Source/shotwell/src/util/file.vala"
 	_tmp4_ = g_get_home_dir ();
@@ -1650,7 +1665,7 @@ gchar* strip_pretty_path (const gchar* path) {
 	result = _tmp9_;
 #line 195 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1654 "file.c"
+#line 1669 "file.c"
 }
 
 
@@ -1671,7 +1686,7 @@ gchar* get_file_info_id (GFileInfo* info) {
 	result = _tmp2_;
 #line 199 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1675 "file.c"
+#line 1690 "file.c"
 }
 
 
@@ -1681,7 +1696,7 @@ 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 1685 "file.c"
+#line 1700 "file.c"
 		guint64 _tmp0_ = 0ULL;
 		guint64 _tmp1_ = 0ULL;
 #line 204 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1690,13 +1705,13 @@ void skip_uint64 (GInputStream* input, guint64 skip_amount, GError** error) {
 		if (!(_tmp0_ > ((guint64) 0))) {
 #line 204 "/home/jens/Source/shotwell/src/util/file.vala"
 			break;
-#line 1694 "file.c"
+#line 1709 "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 1700 "file.c"
+#line 1715 "file.c"
 			GInputStream* _tmp2_ = NULL;
 			guint64 _tmp3_ = 0ULL;
 #line 207 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1709,13 +1724,13 @@ 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 1713 "file.c"
+#line 1728 "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 1719 "file.c"
+#line 1734 "file.c"
 		} else {
 			GInputStream* _tmp4_ = NULL;
 			guint64 _tmp5_ = 0ULL;
@@ -1731,11 +1746,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 1735 "file.c"
+#line 1750 "file.c"
 			}
 #line 211 "/home/jens/Source/shotwell/src/util/file.vala"
 			skip_amount = (guint64) 0;
-#line 1739 "file.c"
+#line 1754 "file.c"
 		}
 	}
 }
@@ -1763,7 +1778,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 1767 "file.c"
+#line 1782 "file.c"
 	}
 #line 221 "/home/jens/Source/shotwell/src/util/file.vala"
 	count = (guint64) 0;
@@ -1775,31 +1790,35 @@ 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"
+		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 0ULL;
-#line 1783 "file.c"
+		return _tmp4_;
+#line 1800 "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 1789 "file.c"
-		GFileInfo* _tmp4_ = NULL;
-		GFileEnumerator* _tmp5_ = NULL;
-		GFileInfo* _tmp6_ = NULL;
+#line 1806 "file.c"
+		GFileInfo* _tmp5_ = NULL;
+		GFileEnumerator* _tmp6_ = NULL;
 		GFileInfo* _tmp7_ = NULL;
-		GFileInfo* _tmp8_ = NULL;
-		guint64 _tmp9_ = 0ULL;
+		GFileInfo* _tmp9_ = NULL;
+		GFileInfo* _tmp10_ = NULL;
+		guint64 _tmp11_ = 0ULL;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp5_ = enumerator;
+		_tmp6_ = enumerator;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp6_ = g_file_enumerator_next_file (_tmp5_, NULL, &_inner_error_);
+		_tmp7_ = g_file_enumerator_next_file (_tmp6_, NULL, &_inner_error_);
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp4_ = _tmp6_;
+		_tmp5_ = _tmp7_;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1821 "file.c"
+			guint64 _tmp8_ = 0ULL;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 			g_propagate_error (error, _inner_error_);
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1807,34 +1826,34 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 			_g_object_unref0 (enumerator);
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-			return 0ULL;
-#line 1812 "file.c"
+			return _tmp8_;
+#line 1831 "file.c"
 		}
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp7_ = _tmp4_;
+		_tmp9_ = _tmp5_;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp4_ = NULL;
+		_tmp5_ = NULL;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_object_unref0 (info);
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-		info = _tmp7_;
+		info = _tmp9_;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp8_ = info;
+		_tmp10_ = info;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-		if (!(_tmp8_ != NULL)) {
+		if (!(_tmp10_ != NULL)) {
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-			_g_object_unref0 (_tmp4_);
+			_g_object_unref0 (_tmp5_);
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 			break;
-#line 1830 "file.c"
+#line 1849 "file.c"
 		}
 #line 227 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp9_ = count;
+		_tmp11_ = count;
 #line 227 "/home/jens/Source/shotwell/src/util/file.vala"
-		count = _tmp9_ + 1;
+		count = _tmp11_ + 1;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-		_g_object_unref0 (_tmp4_);
-#line 1838 "file.c"
+		_g_object_unref0 (_tmp5_);
+#line 1857 "file.c"
 	}
 #line 229 "/home/jens/Source/shotwell/src/util/file.vala"
 	result = count;
@@ -1844,7 +1863,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 1848 "file.c"
+#line 1867 "file.c"
 }
 
 
@@ -1861,21 +1880,21 @@ gboolean file_equal (GFile* a, GFile* b) {
 	_tmp2_ = a;
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp2_ != NULL) {
-#line 1865 "file.c"
+#line 1884 "file.c"
 		GFile* _tmp3_ = NULL;
 #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 1871 "file.c"
+#line 1890 "file.c"
 	} else {
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp1_ = FALSE;
-#line 1875 "file.c"
+#line 1894 "file.c"
 	}
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp1_) {
-#line 1879 "file.c"
+#line 1898 "file.c"
 		GFile* _tmp4_ = NULL;
 		GFile* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
@@ -1887,17 +1906,17 @@ 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 1891 "file.c"
+#line 1910 "file.c"
 	} else {
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp0_ = FALSE;
-#line 1895 "file.c"
+#line 1914 "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 1901 "file.c"
+#line 1920 "file.c"
 }
 
 
@@ -1911,7 +1930,7 @@ guint file_hash (GFile* file) {
 	_tmp1_ = file;
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp1_ != NULL) {
-#line 1915 "file.c"
+#line 1934 "file.c"
 		GFile* _tmp2_ = NULL;
 		guint _tmp3_ = 0U;
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1920,17 +1939,17 @@ guint file_hash (GFile* file) {
 		_tmp3_ = g_file_hash (_tmp2_);
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp0_ = _tmp3_;
-#line 1924 "file.c"
+#line 1943 "file.c"
 	} else {
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp0_ = (guint) 0;
-#line 1928 "file.c"
+#line 1947 "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 1934 "file.c"
+#line 1953 "file.c"
 }
 
 
diff --git a/src/util/image.c b/src/util/image.c
index f6c82ec..1bc543b 100644
--- a/src/util/image.c
+++ b/src/util/image.c
@@ -1,4 +1,4 @@
-/* image.c generated by valac 0.34.4, the Vala compiler
+/* image.c generated by valac 0.34.7, the Vala compiler
  * generated from image.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/util/misc.c b/src/util/misc.c
index 65c37e5..69a38e7 100644
--- a/src/util/misc.c
+++ b/src/util/misc.c
@@ -1,4 +1,4 @@
-/* misc.c generated by valac 0.34.4, the Vala compiler
+/* misc.c generated by valac 0.34.7, the Vala compiler
  * generated from misc.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1187,7 +1187,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 1188 "misc.c"
 	}
 #line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_tmp12_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp12_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
 	intersection = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_SET, GeeSet);
 #line 1194 "misc.c"
@@ -1602,7 +1602,7 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 #line 188 "/home/jens/Source/shotwell/src/util/misc.vala"
 	memcpy (_tmp6_, _tmp7_, (gsize) _tmp8_);
 #line 190 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_tmp9_ = gee_array_list_new (TYPE_PHOTO_ID, (GBoxedCopyFunc) photo_id_dup, photo_id_free, NULL, NULL, NULL);
+	_tmp9_ = gee_array_list_new (TYPE_PHOTO_ID, (GBoxedCopyFunc) photo_id_dup, (GDestroyNotify) photo_id_free, NULL, NULL, NULL);
 #line 190 "/home/jens/Source/shotwell/src/util/misc.vala"
 	list = _tmp9_;
 #line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1874,7 +1874,7 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 #line 216 "/home/jens/Source/shotwell/src/util/misc.vala"
 	memcpy (_tmp6_, _tmp7_, (gsize) _tmp8_);
 #line 218 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_tmp9_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp9_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 218 "/home/jens/Source/shotwell/src/util/misc.vala"
 	list = _tmp9_;
 #line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
diff --git a/src/util/string.c b/src/util/string.c
index 931e58d..ee1a1bb 100644
--- a/src/util/string.c
+++ b/src/util/string.c
@@ -1,4 +1,4 @@
-/* string.c generated by valac 0.34.4, the Vala compiler
+/* string.c generated by valac 0.34.7, the Vala compiler
  * generated from string.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/util/system.c b/src/util/system.c
index d56348e..e7ff262 100644
--- a/src/util/system.c
+++ b/src/util/system.c
@@ -1,4 +1,4 @@
-/* system.c generated by valac 0.34.4, the Vala compiler
+/* system.c generated by valac 0.34.7, the Vala compiler
  * generated from system.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/util/ui.c b/src/util/ui.c
index 2cb3739..e881e93 100644
--- a/src/util/ui.c
+++ b/src/util/ui.c
@@ -1,4 +1,4 @@
-/* ui.c generated by valac 0.34.4, the Vala compiler
+/* ui.c generated by valac 0.34.7, the Vala compiler
  * generated from ui.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.